diff --git a/.gitignore b/.gitignore
index f00c559..e826276 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /setuptools-18.1.tar.gz
 /setuptools-18.3.1.tar.gz
 /setuptools-18.3.2.tar.gz
+/setuptools-18.4.tar.gz
diff --git a/python-setuptools.spec b/python-setuptools.spec
index b043008..b973352 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -1,11 +1,11 @@
 %if 0%{?fedora}
 %global with_python3 1
-%global with_check 0
+%global with_check 1
 
 # This controls whether setuptools is build as a wheel or not,
 # simplifying Python 3.4 bootstraping process
 %if %{fedora} > 20
-%global build_wheel 0
+%global build_wheel 1
 %endif
 
 %else
@@ -26,8 +26,8 @@
 %endif
 
 Name:           python-setuptools
-Version:        18.3.2
-Release:        2%{?dist}
+Version:        18.4
+Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 
 Group:          Applications/System
@@ -207,6 +207,10 @@ popd
 %endif # with_python3
 
 %changelog
+* Tue Oct 13 2015 Robert Kuska <rkuska@redhat.coM> - 18.4-1
+- Update to 18.4. Fixes bug #1270578
+- Build with wheel and check phase
+
 * Wed Sep 23 2015 Robert Kuska <rkuska@redhat.com> - 18.3.2-2
 - Python3.5 rebuild: rebuild without wheel and check phase
 
diff --git a/sources b/sources
index 17997db..3615592 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d30c969065bd384266e411c446a86623  setuptools-18.3.2.tar.gz
+214c6c43bd7035e870c1beab402c48e7  setuptools-18.4.tar.gz