diff --git a/.gitignore b/.gitignore
index 51d8210..a55e7cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 rpmfluff-0.3.tar.bz2
+/rpmfluff-0.4.tar.bz2
diff --git a/python-rpmfluff.spec b/python-rpmfluff.spec
index 1487a05..237e850 100644
--- a/python-rpmfluff.spec
+++ b/python-rpmfluff.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:          python-rpmfluff
-Version:       0.3
-Release:       14%{?dist}
+Version:       0.4
+Release:       1%{?dist}
 Summary:       Lightweight way of building RPMs, and sabotaging them
 License:       GPLv2
 Group:         Development/Tools
@@ -25,17 +25,54 @@ It can also be used to construct test cases for package management software
 such as rpm and yum.
 
 
+%package -n python3-rpmfluff
+Summary:       Lightweight way of building RPMs, and sabotaging them
+Buildrequires: python3-devel
+BuildRequires: python3-setuptools
+
+
+%description -n python3-rpmfluff
+rpmfluff provides a python library for building RPM packages, and
+sabotaging them so they are broken in controlled ways.
+
+It is intended for use when validating package analysis tools such as RPM lint.
+It can also be used to construct test cases for package management software
+such as rpm and yum.
+
+This is the Python 3 version of the package.
+
 %prep
-%setup -q -n rpmfluff-%{version}
+%setup -qc
+mv rpmfluff-%{version} python2
+
+pushd python2
+# Copy common doc files to the top directory
+cp -pr README LICENSE ../
+
+popd
+
+cp -a python2 python3
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+pushd python2
+%{__python2} setup.py build
+popd
+
+pushd python3
+%{__python3} setup.py build
+popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+pushd python2
+%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
+popd
+
+pushd python3
+%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT
+popd
 
 
 %clean
@@ -46,11 +83,23 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README
 %doc LICENSE
-%{python_sitelib}/rpmfluff.py*
-%{python_sitelib}/rpmfluff*.egg-info
+%{python2_sitelib}/rpmfluff.py*
+%{python2_sitelib}/rpmfluff*.egg-info
 
 
+%files -n python3-rpmfluff
+%defattr(-,root,root,-)
+%doc README
+%doc LICENSE
+%{python3_sitelib}/rpmfluff.py*
+%{python3_sitelib}/__pycache__/rpmfluff.*
+%{python3_sitelib}/rpmfluff*.egg-info
+
 %changelog
+* Thu Jul 09 2015 Jan Hutar <jhutar@redhat.com> - 0.4-1
+- David Shea did a lots of work to support Python 3
+- RHEL5 (i.e. Python 2.4) support dropped
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
@@ -81,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Feb 12 2010 Jan Hutar <jhutar@redhat.com> - 0.3-5
 - Now version is in the separate file
 
-* Thu Jan 26 2010 Jan Hutar <jhutar@redhat.com> - 0.3-4
+* Tue Jan 26 2010 Jan Hutar <jhutar@redhat.com> - 0.3-4
 - Fix for deprecated popen2 module
 
 * Thu Jan 7 2010 Jan Hutar <jhutar@redhat.com> - 0.3-3
diff --git a/sources b/sources
index 69855a7..4a09ca9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-296472d772ee0cc04e9d9afd35880fd1  rpmfluff-0.3.tar.bz2
+9be71ad031d1af9e625452e0dada5f11  rpmfluff-0.4.tar.bz2