diff --git a/python-setproctitle.changes b/python-setproctitle.changes
index 6187570..c97a8a0 100644
--- a/python-setproctitle.changes
+++ b/python-setproctitle.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 14 09:58:08 UTC 2013 - saschpe@suse.de
+
+- Simplify macro usage
+
 -------------------------------------------------------------------
 Wed Sep 12 04:08:16 UTC 2012 - os-dev@jacraig.com
 
diff --git a/python-setproctitle.spec b/python-setproctitle.spec
index e57f39f..36c04e1 100644
--- a/python-setproctitle.spec
+++ b/python-setproctitle.spec
@@ -16,11 +16,6 @@
 #
 
 
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%define mod_name setproctitle
-
 Name:           python-setproctitle
 Version:        1.1.6
 Release:        0
@@ -31,8 +26,8 @@ Url:            http://pypi.python.org/pypi/setproctitle/
 Source:         http://pypi.python.org/packages/source/s/setproctitle/setproctitle-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
-%if 0%{?suse_version}
-%py_requires
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(11)")}
 %endif
 
 %description
@@ -42,7 +37,7 @@ the task each process is busy with. The technique is used by PostgreSQL  and
 the OpenSSH Server for example.
 
 %prep
-%setup -q -n %{mod_name}-%{version}
+%setup -q -n setproctitle-%{version}
 
 %build
 CFLAGS="%{optflags}" python setup.py build
@@ -53,6 +48,6 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 %files
 %defattr(-,root,root)
 %doc COPYRIGHT HISTORY.rst README.rst
-%python_sitearch/%{mod_name}*
+%{python_sitearch}/*
 
 %changelog
diff --git a/python3-setproctitle.changes b/python3-setproctitle.changes
index cd652c1..a9b71e2 100644
--- a/python3-setproctitle.changes
+++ b/python3-setproctitle.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 14 09:58:25 UTC 2013 - saschpe@suse.de
+
+- Drop buildrequires python3-2to3, it's in python3-devel now
+- Don't require "python(abi)", RPM does that automatically
+
 -------------------------------------------------------------------
 Sat Jan 12 12:07:59 UTC 2013 - idonmez@suse.com
 
diff --git a/python3-setproctitle.spec b/python3-setproctitle.spec
index 3c3151a..1db183f 100644
--- a/python3-setproctitle.spec
+++ b/python3-setproctitle.spec
@@ -16,8 +16,6 @@
 #
 
 
-%define modname setproctitle
-
 Name:           python3-setproctitle
 Version:        1.1.6
 Release:        0
@@ -26,9 +24,7 @@ License:        BSD-3-Clause
 Group:          Development/Libraries/Python
 Url:            http://pypi.python.org/pypi/setproctitle/
 Source:         http://pypi.python.org/packages/source/s/setproctitle/setproctitle-%{version}.tar.gz
-BuildRequires:  python3-2to3
 BuildRequires:  python3-devel
-Requires:       python3 >= %{py3_ver}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -38,18 +34,17 @@ the task each process is busy with. The technique is used by PostgreSQL  and
 the OpenSSH Server for example.
 
 %prep
-%setup -q -n %{modname}-%{version}
+%setup -q -n setproctitle-%{version}
 
 %build
 CFLAGS="%{optflags}" python3 setup.py build
 
 %install
-python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
-%files -f INSTALLED_FILES
+%files
 %defattr(-,root,root)
+%doc COPYRIGHT HISTORY.rst README.rst
+%{python3_sitearch}/*
 
 %changelog