diff --git a/python-xattr.changes b/python-xattr.changes
new file mode 100644
index 0000000..ea2904b
--- /dev/null
+++ b/python-xattr.changes
@@ -0,0 +1,7 @@
+-------------------------------------------------------------------
+Tue May 31 12:50:15 UTC 2011 - saschpe@suse.de
+
+- Spec file cleanup:
+  * Regenerated with py2pack to fix completely broken mess
+  * Add changes file
+  * Fixed executable-bit rpmlint warning
diff --git a/python-xattr.spec b/python-xattr.spec
index f5ae332..4522cae 100644
--- a/python-xattr.spec
+++ b/python-xattr.spec
@@ -1,61 +1,64 @@
-# norootforbuild
+#
+# spec file for package python-xattr
+#
+# 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-xattr
-Version:			 0.5
-Release:			 0
-Summary:			 Python Wrapper for Extended Filesytem Attributes
-# http://svn.red-bean.com/bob/xattr/releases/xattr-%{version}/
-Source:			 xattr-%{version}.tar.bz2
-Source1:    	 http://pypi.python.org/packages/2.5/s/setuptools/setuptools-0.6c9-py%{py_ver}.egg
-URL:				 http://www.undefined.org/python/#xattr
-Group:			 Development/Libraries/Python
-License:			 MIT License
-BuildRoot:		 %{_tmppath}/build-%{name}-%{version}
-BuildRequires:	 python python-devel glibc-devel gcc
+
+Name:           python-xattr
+Version:        0.6.1
+Release:        0
+Url:            http://undefined.org/python/#xattr
+Summary:        Python wrapper for extended filesystem attributes
+License:        MIT/X11
+Group:          Development/Languages/Python
+Source:         xattr-0.6.1.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  python-devel
+BuildRequires:  python-distribute
+%if 0%{?suse_version}
 %py_requires
+%endif
+%{!?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)")}
 
 %description
-xattr is a Python wrapper for Darwin, Linux, and FreeBSD extended filesystem
-attributes.
+Extended attributes extend the basic attributes of files and directories
+in the file system.  They are stored as name:data pairs associated with
+file system objects (files, directories, symlinks, etc).
 
-Extended attributes extend the basic attributes of files and directories in
-the file system. They are stored as name:data pairs associated with file
-system objects (files, directories, symlinks, etc).
+Extended attributes are currently only available on Darwin 8.0+ (Mac OS X 10.4)
+and Linux 2.6+. Experimental support is included for Solaris and FreeBSD.
 
-
-
-
-Authors:
---------
-    Bob Ippolito <bob@redivi.com>
-
-%debug_package
 %prep
-%setup -q -n "xattr-%{version}"
-%__cp "%{SOURCE1}" .
+%setup -q -n xattr-%{version}
 
 %build
-CFLAGS="%{optflags}" \
-%__python ./setup.py build
+export CFLAGS="%{optflags}"
+python setup.py build
 
 %install
-%__python ./setup.py install \
-    --prefix="%{_prefix}" \
-    --root="%{buildroot}" \
-    --record-rpm=files.lst
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+chmod 0755 %{buildroot}%{python_sitearch}/xattr/tool.py # Fix executable-bit rpmlint warning
 
 %clean
-%__rm -rf "%{buildroot}"
+rm -rf %{buildroot}
 
-%files -f files.lst
-%defattr(-,root,root)
-%doc README.txt LICENSE.txt TODO.txt
+%files
+%defattr(-,root,root,-)
+%doc LICENSE.txt README.txt TODO.txt
+%{_bindir}/xattr
+%{python_sitearch}/*
 
 %changelog
-* Fri May  8 2009 Pascal Bleser <pascal.bleser@opensuse.org> 0.5
-- new package
-
-# Local Variables:
-# mode: rpm-spec
-# tab-width: 3
-# End:
diff --git a/setuptools-0.6c9-py2.5.egg b/setuptools-0.6c9-py2.5.egg
deleted file mode 100644
index cadda90..0000000
Binary files a/setuptools-0.6c9-py2.5.egg and /dev/null differ
diff --git a/setuptools-0.6c9-py2.6.egg b/setuptools-0.6c9-py2.6.egg
deleted file mode 100644
index 7051b37..0000000
Binary files a/setuptools-0.6c9-py2.6.egg and /dev/null differ
diff --git a/xattr-0.5.tar.bz2 b/xattr-0.5.tar.bz2
deleted file mode 100644
index 97a5fe3..0000000
--- a/xattr-0.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1afdf59bb2f758b0f596f82d08f2e4064d69520460917e72070ec15deae67d74
-size 15298
diff --git a/xattr-0.6.1.tar.gz b/xattr-0.6.1.tar.gz
new file mode 100644
index 0000000..17d801c
--- /dev/null
+++ b/xattr-0.6.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c025768496f3162f79059456c870ab5ef7094c39bb1f138446df44981e18069
+size 14585