diff --git a/python-python-daemon.changes b/python-python-daemon.changes
index 9a3163e..7a4c96b 100644
--- a/python-python-daemon.changes
+++ b/python-python-daemon.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 20 14:54:32 UTC 2011 - saschpe@suse.de
+
+- Changed BuildRequires python-minimock to python-MiniMock
+- Removed %clean section and some other useless stuff
+
 -------------------------------------------------------------------
 Mon May 30 15:34:01 UTC 2011 - alexandre@exatati.com.br
 
diff --git a/python-python-daemon.spec b/python-python-daemon.spec
index a330eb6..859adc2 100644
--- a/python-python-daemon.spec
+++ b/python-python-daemon.spec
@@ -11,28 +11,24 @@
 # 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/
 #
 
 
-%{!?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 python-daemon
-
-Name:           python-%{mod_name}
+Name:           python-python-daemon
 Version:        1.6
-Release:        1
+Release:        0
 Url:            http://pypi.python.org/pypi/python-daemon/
 Summary:        Library to implement a well-behaved Unix daemon process
 License:        PSF-2+
 Group:          Development/Languages/Python
-Source:         %{mod_name}-%{version}.tar.bz2
+Source:         python-daemon-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
 BuildRequires:  python-distribute
-BuildRequires:  python-minimock
+BuildRequires:  python-MiniMock
 Requires:       python-lockfile
 %if 0%{?suse_version}
 %py_requires
@@ -40,6 +36,7 @@ Requires:       python-lockfile
 BuildArch:      noarch
 %endif
 %endif
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 This library implements the well-behaved daemon specification of PEP 3143, "Standard daemon
@@ -50,22 +47,18 @@ same for every daemon program. A DaemonContext instance holds the behaviour and
 process environment for the program; use the instance as a context manager to enter a daemon state.
 
 %prep
-%setup -q -n %{mod_name}-%{version}
+%setup -q -n python-daemon-%{version}
+sed -i "1d" daemon/version/version_info.py # Fix non-executable script
 
 %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,-)
 %doc ChangeLog
-%python_sitelib/daemon*
-%python_sitelib/*.egg-info
+%{python_sitelib}/*
 
 %changelog