diff --git a/python-ipaddr.changes b/python-ipaddr.changes
index 1c8ab38..40b0d31 100644
--- a/python-ipaddr.changes
+++ b/python-ipaddr.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 22 08:32:18 UTC 2011 - saschpe@suse.de
+
+- Re-generated spec file with py2pack
+- Run testsuite (using python-nose)
+- Fix non-executable script rpmlint warning
+
 -------------------------------------------------------------------
 Fri Jul  8 09:47:53 UTC 2011 - klaussfreire@users.sourceforge.net
 
diff --git a/python-ipaddr.spec b/python-ipaddr.spec
index b9a75c6..1e4a061 100644
--- a/python-ipaddr.spec
+++ b/python-ipaddr.spec
@@ -1,62 +1,61 @@
+#
+# spec file for package python-ipaddr
+#
+# Copyright (c) 2011 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:           python-ipaddr
 Version:        2.1.9
-Release:        1
-Summary:        Python IP address manipulation library
-Group:          Development/Libraries/Python
-License:        Apache-2.0
-URL:            http://code.google.com/p/ipaddr-py/
-Source0:        http://ipaddr-py.googlecode.com/files/ipaddr-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-build
-BuildRequires:  python-setuptools
-%if 0%{?suse_version} > 1010
-BuildRequires:  fdupes
-%endif
-%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1130
-# py_requires is no longer needed since 11.3
-%py_requires
-%else
-%if 0%{?suse_version}
-Requires:       python-base = %{py_ver}
-%else
-Requires:       python
-%endif
-%if 0%{?fedora}
-# Fedora requires python-devel
+Release:        0
+Url:            http://code.google.com/p/ipaddr-py/
+Summary:        Google's IP address manipulation library
+License:        Apache License, Version 2.0
+Group:          Development/Languages/Python
+Source:         ipaddr-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
+BuildRequires:  python-distribute
+BuildRequires:  python-nose
+%if 0%{?suse_version}
+%py_requires
+%if 0%{?suse_version} > 1110
+BuildArch:      noarch
 %endif
 %endif
-%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}
-BuildArchitectures: noarch
-%endif
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
-An IPv4/IPv6 manipulation library in Python. This library is used to create/poke/manipulate IPv4 and IPv6 addresses and prefixes.
+Google's IP address manipulation library. An IPv4/IPv6 manipulation library
+in Python. This library is used to create/poke/manipulate IPv4 and IPv6
+addresses and prefixes.
 
 %prep
 %setup -q -n ipaddr-%{version}
+sed -i "1d" ipaddr.py # Fix non-executable script
 
 %build
-%{__python} setup.py build
+python setup.py build
 
 %install
-%if 0%{?suse_version}
-%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} --compile --optimize=2 --record-rpm=INSTALLED_FILES
-%else
-%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} --compile --optimize=2 --record=INSTALLED_FILES
-%endif
-%if 0%{?suse_version} > 1010
-%fdupes %{buildroot}%{py_sitedir}
-%endif
-%if 0%{?mdkversion} >= 201001
-# Mandriva 2010.1 has some issues with byte compiling
-# It refuses to, but it still outputs the .py[co] to the INSTALLED_FILES list
-grep -v '[.]py[co]$' INSTALLED_FILES > INSTALLED_FILES_MDK
-mv -f INSTALLED_FILES_MDK INSTALLED_FILES
-%endif
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-%files -f INSTALLED_FILES
-%defattr(-,root,root)
-%doc README
-%doc COPYING
+%check
+nosetests
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING README  RELEASENOTES
+%{python_sitelib}/*
 
 %changelog