diff --git a/.gitignore b/.gitignore
index 3e1e95e..704133f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/PyGreSQL-5.0.3.tar.gz
+/PyGreSQL-5.0.4.tar.gz
diff --git a/PyGreSQL-5.0.3-python-3.6.patch b/PyGreSQL-5.0.3-python-3.6.patch
deleted file mode 100644
index 20ba7a8..0000000
--- a/PyGreSQL-5.0.3-python-3.6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7fe2cc4d84d37e29f256fd8f614861121a2da254 Mon Sep 17 00:00:00 2001
-From: Christoph Zwerschke <cito@online.de>
-Date: Fri, 6 Jan 2017 16:36:05 +0000
-Subject: [PATCH] Fix an issue with Python 3.6
-
-While running over a dictionary in a for loop, we altered its values.
-This used to work perfectly well in Python before 3.6, but now causes
-problems, probably due to internal optimizations. We avoid this now.
----
- pg.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pg.py b/pg.py
-index 117e440..5942d50 100644
---- a/pg.py
-+++ b/pg.py
-@@ -708,7 +708,7 @@ class Adapter:
-             # so we first must find the values actually used in the command
-             used_values = {}
-             literals = dict.fromkeys(values, '')
--            for key in literals:
-+            for key in values:
-                 del literals[key]
-                 try:
-                     command % literals
--- 
-2.9.3
-
diff --git a/PyGreSQL.spec b/PyGreSQL.spec
index 2da2f68..f18dfc7 100644
--- a/PyGreSQL.spec
+++ b/PyGreSQL.spec
@@ -4,8 +4,8 @@
 %{!?runselftest:%global runselftest 1}
 
 Name:		%{srcname}
-Version:	5.0.3
-Release:	6%{?dist}
+Version:	5.0.4
+Release:	1%{?dist}
 Summary:	%{sum}
 
 Group:		Applications/Databases
@@ -19,8 +19,6 @@ License:	PostgreSQL or Python
 
 Source0:	http://www.pygresql.org/files/PyGreSQL-%{version}.tar.gz
 
-Patch0:		%name-5.0.3-python-3.6.patch
-
 # PyGreSQL was originally shipped as a sub-RPM of the PostgreSQL package;
 # these Provides/Obsoletes give a migration path.  Note there is no
 # intention of changing the version numbers in future.
@@ -99,7 +97,7 @@ exit 0
 
 cat > LOCAL_PyGreSQL.py <<EOF
 dbname = '${PGTESTS_DATABASES##*:}'
-dbhost = '$PGHOST'
+dbhost = ''
 dbport = $PGPORT
 EOF
 
@@ -108,6 +106,10 @@ EOF
 
 
 %changelog
+* Wed Aug 16 2017 Pavel Raiskup <praiskup@redhat.com> - 5.0.4-1
+- Rebase to upstream version 5.0.4 per rhbz#1475595
+  See changelog http://www.pygresql.org/changelog.html
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index e9a746a..38fcc44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (PyGreSQL-5.0.3.tar.gz) = bbec22a2d4ca09b570b0e4845e3c7592a15173639a3fe7fa59426ad6354bf1cab7dc1e21ceda16b42b8bbb4f6653aa59288b4f22238cd0baf2f6ebe98622d17e
+SHA512 (PyGreSQL-5.0.4.tar.gz) = f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6