diff --git a/python-docutils.changes b/python-docutils.changes
index 2fda18a..9630fc3 100644
--- a/python-docutils.changes
+++ b/python-docutils.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Mon Apr 30 14:07:34 UTC 2012 - cfarrell@suse.com
+
+- license update: Python-2.0 and BSD-2-Clause and GPL-2.0+ and GPL-3.0+ and
+  SUSE-Public-Domain
+  tools/editors/emacs/rst.el is GPL-3.0+ - see also COPYING file
+
+-------------------------------------------------------------------
+Fri Apr 27 14:07:19 UTC 2012 - toddrme2178@gmail.com
+
+- Fix building python 3 package on openSUSE 11.4 x86_64
+
+-------------------------------------------------------------------
+Tue Apr 24 09:02:35 UTC 2012 - saschpe@suse.de
+
+- Disable testsuite altogether, fails also on the bleeding_edge_* repos
+
+-------------------------------------------------------------------
+Tue Feb 28 08:58:23 UTC 2012 - saschpe@suse.de
+
+- Fixed SLE_11_SP2 build by disabling the testsuite
+
 -------------------------------------------------------------------
 Fri Sep 23 10:19:38 UTC 2011 - saschpe@suse.de
 
diff --git a/python-docutils.spec b/python-docutils.spec
index f140447..b4a69a4 100644
--- a/python-docutils.spec
+++ b/python-docutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-docutils
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,16 @@
 #
 
 
-
 Name:           python-docutils
 Version:        0.8.1
 Release:        0
-Url:            http://docutils.sourceforge.net/
 Summary:        Python Documentation Utilities
-License:        public domain, Python, BSD-2-Clause, GPL (see COPYING.txt)
+License:        Python-2.0 and BSD-2-Clause and GPL-2.0+ and GPL-3.0+ and SUSE-Public-Domain
 Group:          Development/Languages/Python
-Source:         http://downloads.sourceforge.net/project/docutils/docutils/0.8.1/docutils-0.8.1.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Url:            http://docutils.sourceforge.net/
+Source:         http://downloads.sourceforge.net/project/docutils/docutils/%{version}/docutils-%{version}.tar.gz
 BuildRequires:  python-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
 BuildRequires:  python-xml
 Requires:       python-xml
@@ -35,15 +34,13 @@ Requires:       python-xml
 BuildRequires:  pyxml
 Requires:       pyxml
 %endif
-%if 0%{?suse_version}
-%py_requires
-%if 0%{?suse_version} > 1110
-BuildArch:      noarch
-%endif
-%endif
 Provides:       docutils = %{version}
 Obsoletes:      docutils < %{version}
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%else
+BuildArch:      noarch
+%endif
 
 %description
 Docutils is a modular system for processing documentation into useful formats,
@@ -55,23 +52,16 @@ easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.
 
 %build
 python setup.py build
-sed -i "1d" docutils/{math/math2html,_string_template_compat,error_reporting,writers/xetex/__init__,math/latex2mathml}.py # Fix non-executable scripts
+sed -i "s|#!\s*\/usr\/bin\/env python||g" docutils/{math/math2html,_string_template_compat,error_reporting,writers/xetex/__init__,math/latex2mathml}.py # Fix non-executable scripts
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 for i in %{buildroot}%{_bindir}/rst*; do mv "$i" "${i/.py}"; done # Remove useless ".py" ending from executables
 
-# Tests break SLE and Mandriva builds
-%if ! 0%{?sles_version} && ! 0%{?mandriva_version}
-
-%check
-cd test && python alltests.py
-%endif
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt BUGS.txt docs/* licenses
 %{_bindir}/rst*
-%python_sitelib/*
+%{python_sitelib}/*
 
 %changelog
diff --git a/python3-docutils.changes b/python3-docutils.changes
new file mode 100644
index 0000000..4af1a2a
--- /dev/null
+++ b/python3-docutils.changes
@@ -0,0 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 27 14:07:19 UTC 2012 - toddrme2178@gmail.com
+
+- Fix building python 3 package on openSUSE 11.4 x86_64
+
+-------------------------------------------------------------------
+Mon Apr 23 12:00:49 UTC 2012 - toddrme2178@gmail.com
+
+- Add python 3 package
+
diff --git a/python3-docutils.spec b/python3-docutils.spec
new file mode 100644
index 0000000..d70264b
--- /dev/null
+++ b/python3-docutils.spec
@@ -0,0 +1,69 @@
+#
+# spec file for package python3-docutils
+#
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+Name:           python3-docutils
+Version:        0.8.1
+Release:        0
+License:        public domain, Python, BSD-2-Clause, GPL (see COPYING.txt)
+Summary:        Python Documentation Utilities
+Url:            http://docutils.sourceforge.net/
+Group:          Development/Languages/Python
+Source:         http://downloads.sourceforge.net/project/docutils/docutils/0.8.1/docutils-0.8.1.tar.gz
+BuildRequires:  python3
+BuildRequires:  python3-2to3
+BuildRequires:  python3-devel
+BuildRequires:  python3-xml
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires:       python3-xml
+%if 0%{?suse_version} <= 1140
+%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)}
+%ifarch x86_64
+# to allow ownership of noarch python directories
+BuildRequires:  python3-32bit 
+%endif
+%endif
+BuildArch:      noarch
+Requires:       python3 >= %{py3_ver}
+
+%description
+Docutils is a modular system for processing documentation into useful formats,
+such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an
+easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.
+
+%prep
+%setup -n docutils-%{version}
+
+%build
+python3 setup.py build
+sed -i "s|#!\s*\/usr\/bin\/env python3||g" docutils/{math/math2html,_string_template_compat,error_reporting,writers/xetex/__init__,math/latex2mathml}.py # Fix non-executable scripts
+
+%install
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
+for i in %{buildroot}%{_bindir}/rst*; do mv "$i" "${i/.py}-python%{py3_ver}"; done # Remove useless ".py" ending from executables and add -python3.x suffix
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt BUGS.txt docs/* licenses
+%{_bindir}/rst*-python%{py3_ver}
+%{python3_sitelib}/*
+%if 0%{?suse_version} <= 1140
+%dir %{python3_sitelib}
+%endif
+
+%changelog