diff --git a/python-odfpy.changes b/python-odfpy.changes
index c86c915..383e2ae 100644
--- a/python-odfpy.changes
+++ b/python-odfpy.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep 21 13:47:47 UTC 2011 - saschpe@suse.de
+
+- Fix non-executable scripts
+- Removed %clean section and CFLAGS, not needed
+
 -------------------------------------------------------------------
 Thu Mar 31 14:25:41 UTC 2011 - saschpe@suse.de
 
diff --git a/python-odfpy.spec b/python-odfpy.spec
index 877f2ee..2c42c3f 100644
--- a/python-odfpy.spec
+++ b/python-odfpy.spec
@@ -15,29 +15,25 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-%{!?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 odfpy
-
-Name:           python-%{mod_name}
+Name:           python-odfpy
 Version:        0.9.3
 Release:        0
 Url:            http://opendocumentfellowship.com/development/projects/odfpy
 Summary:        Python API and tools to manipulate OpenDocument files
-License:        GPLv2+, ASLv2
+License:        GPL-2.0+, Apache-2.0
 Group:          Development/Languages/Python
-Source:         %{mod_name}-%{version}.tar.bz2
+Source:         odfpy-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+BuildRequires:  python-distribute
 %if 0%{?suse_version}
 %py_requires
 %if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
 %endif
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 Odfpy is a library to read and write OpenDocument v. 1.1 files.
@@ -67,22 +63,19 @@ In addition to the API, there are a few scripts:
 Visit http://odfpy.forge.osor.eu/ for documentation and examples.
 
 %prep
-%setup -q -n %{mod_name}-%{version}
+%setup -q -n odfpy-%{version}
+sed -i "1d" odf/{userfield,odf2xhtml,manifest,element,elementtypes,load,odfmanifest,thumbnail}.py # Fix non-executable scripts
 
 %build
-export CFLAGS="%{optflags}"
 python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_mandir}/man1/*
-%python_sitelib/odf*
+%python_sitelib/*
 
 %changelog