diff --git a/python-scour.changes b/python-scour.changes
index d7edb42..f07971b 100644
--- a/python-scour.changes
+++ b/python-scour.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 30 10:37:42 UTC 2012 - saschpe@suse.de
+
+- Ran spec-cleaner and did some minor cleanup
+- Set license to SPDX style (Apache-2.0)
+
 -------------------------------------------------------------------
 Fri Jan 27 11:46:43 UTC 2012 - i@marguerite.su
 
diff --git a/python-scour.spec b/python-scour.spec
index 95c954c..aee7d80 100644
--- a/python-scour.spec
+++ b/python-scour.spec
@@ -15,21 +15,23 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 Name:           python-scour
-Version:	0.26
-Release:	1
-License:	ASL-2.0+
-Summary:	An SVG scrubber
-Url:		http://www.codedread.com/scour
-Group:		System/Libraries
-Source:		%{name}-%{version}.tar.bz2
+Version:        0.26
+Release:        0
+License:        Apache-2.0
+Summary:        An SVG scrubber
+Url:            http://www.codedread.com/scour
+Group:          System/Libraries
+Source:         %{name}-%{version}.tar.bz2
 BuildRequires:  python-devel
-Provides:	scour = %{version}
+Provides:       scour = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{py_requires}
-BuildArch:	noarch
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%else
+BuildArch:      noarch
+%endif
 
 %description
 Scour is an open-source Python script that aggressively cleans SVG files, removing a lot of 'cruft' that certain tools or authors embed into their documents. The goal of scour is to provide an identically rendered image.
@@ -40,21 +42,15 @@ Scour is an open-source Python script that aggressively cleans SVG files, removi
 %build
 
 %install
-%{__mkdir} -pv %{buildroot}%{python_sitelib}/scour/
-%{__mkdir} -pv %{buildroot}%{_bindir}
-
-%{__mv} scour.py %{buildroot}%{python_sitelib}/scour/
-%{__mv} svg_regex.py %{buildroot}%{python_sitelib}/scour/
-%{__mv} svg_transform.py %{buildroot}%{python_sitelib}/scour/
-%{__mv} yocto_css.py %{buildroot}%{python_sitelib}/scour/
-
+mkdir -p %{buildroot}%{python_sitelib}/scour
+mkdir -p %{buildroot}%{_bindir}
+mv {scour,svg_regex,svg_transform,yocto_css}.py %{buildroot}%{python_sitelib}/scour/
 ln -sf %{python_sitelib}/scour/scour.py %{buildroot}%{_bindir}/scour
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
 
 %files
 %defattr(-,root,root)
-%{python_sitelib}/scour/
+%doc LICENSE NOTICE README.txt
 %{_bindir}/scour
+%{python_sitelib}/scour/
 
 %changelog