diff --git a/ZConfig-3.0.3.tar.gz b/ZConfig-3.0.3.tar.gz
deleted file mode 100644
index dbe6926..0000000
--- a/ZConfig-3.0.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6577da957511d8c2f805fefd2e31cacc4117bb5c54aec03ad8ce374020c021f3
-size 259838
diff --git a/ZConfig-3.0.4.tar.gz b/ZConfig-3.0.4.tar.gz
new file mode 100644
index 0000000..74848e3
--- /dev/null
+++ b/ZConfig-3.0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7db2f932e74730eb5302e16964f9997121b5381738ac87ddf9559b5df2a0bffe
+size 260105
diff --git a/python-ZConfig.changes b/python-ZConfig.changes
index 29c69d7..11afec0 100644
--- a/python-ZConfig.changes
+++ b/python-ZConfig.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr 16 17:00:09 UTC 2014 - p.drouand@gmail.com
+
+- Update to version 3.0.4
+  + Added Python 3.4 support
+- Implement update-alternatives
+
 -------------------------------------------------------------------
 Thu Sep 26 10:48:47 UTC 2013 - toddrme2178@gmail.com
 
diff --git a/python-ZConfig.spec b/python-ZConfig.spec
index c71b1f9..2668155 100644
--- a/python-ZConfig.spec
+++ b/python-ZConfig.spec
@@ -17,7 +17,7 @@
 
 
 Name:           python-ZConfig
-Version:        3.0.3
+Version:        3.0.4
 Release:        0
 Summary:        Structured Configuration Library
 License:        ZPL-2.1
@@ -70,16 +70,38 @@ python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+# Rename binaries to get package installable with py/py3 package
+mv %{buildroot}%{_bindir}/zconfig %{buildroot}%{_bindir}/zconfig-%{py_ver}
+mv %{buildroot}%{_bindir}/zconfig_schema2html %{buildroot}%{_bindir}/zconfig_schema2html-%{py_ver}
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+touch %{buildroot}%{_sysconfdir}/alternatives/zconfig
+ln -sf %{_sysconfdir}/alternatives/zconfig %{buildroot}/%{_bindir}/zconfig
+touch %{buildroot}%{_sysconfdir}/alternatives/zconfig_schema2html
+ln -sf %{_sysconfdir}/alternatives/zconfig_schema2html %{buildroot}/%{_bindir}/zconfig_schema2html
 
 %check
 python setup.py test -v
 
+%post
+update-alternatives \
+    --install %{_bindir}/zconfig zconfig %{_bindir}/zconfig-%{py_ver} 30 \
+    --slave %{_bindir}/zconfig_schema2html zconfig_schema2html %{_bindir}/zconfig_schema2html-%{py_ver}
+
+%preun
+if [ $1 -eq 0 ] ; then
+    update-alternatives --remove zconfig %{_bindir}/zconfig-%{py_ver}
+fi
+
 %files
 %defattr(-,root,root)
 %doc CHANGES.txt COPYRIGHT.txt LICENSE.txt PKG-INFO README.txt
 %{python_sitelib}/*
+%ghost %{_sysconfdir}/alternatives/zconfig
+%ghost %{_sysconfdir}/alternatives/zconfig_schema2html
 %{_bindir}/zconfig
+%{_bindir}/zconfig-%{py_ver}
 %{_bindir}/zconfig_schema2html
+%{_bindir}/zconfig_schema2html-%{py_ver}
 
 %files doc
 %defattr(-,root,root,-)