diff --git a/python-minimock.spec b/python-minimock.spec
index 4f7662b..9125f5b 100644
--- a/python-minimock.spec
+++ b/python-minimock.spec
@@ -1,8 +1,12 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+    %global with_python3 1
+%endif
+
 Name:           python-minimock
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        The simplest possible mock library
 
 Group:          Development/Tools
@@ -15,22 +19,51 @@ BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 
+%if 0%{?with_python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python-tools
+%endif
+
 %description
 minimock is a simple library for doing Mock objects with doctest.
 
+%if 0%{?with_python3}
+%package -n python3-minimock
+Summary:        The simplest possible mock library
+%description -n python3-minimock
+minimock is a simple library for doing Mock objects with doctest.
+%endif
 
 %prep
 %setup -q -n MiniMock-%{version}
 
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -ar . %{py3dir}
+2to3 --write --nobackups %{py3dir}
+%endif
 
 %build
 %{__python} setup.py build
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+    %{__python3} setup.py build
+popd
+%endif
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+    %{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+popd
+%endif
+
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,10 +72,25 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc docs/*
-%{python_sitelib}/*
+%{python_sitelib}/MiniMock-%{version}-py?.?.egg-info
+%{python_sitelib}/minimock*
 
+%if 0%{?with_python3}
+%files -n python3-minimock
+%defattr(-,root,root,-)
+%doc docs/*
+%{python3_sitelib}/MiniMock-%{version}-py?.?.egg-info
+%{python3_sitelib}/minimock*
+%endif
 
 %changelog
+* Fri Feb  5 2010 Thomas Spura <tomspur@fedoraproject.org> - 1.2.5-3
+- update python3 subpackage to reflect actuall guidelines
+
+* Thu Jan 14 2010 Thomas Spura <tomspur@fedoraproject.org> - 1.2.5-2
+- also ship python3-minimock
+- be more explicit in %%files
+
 * Thu Dec 22 2009 Thomas Spura <tomspur@fedoraproject.org> - 1.2.5-1
 - correct URL
 - update to new version