diff --git a/python-FormEncode.changes b/python-FormEncode.changes
index f72965d..db9f8b9 100644
--- a/python-FormEncode.changes
+++ b/python-FormEncode.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Mar 14 13:44:30 UTC 2012 - saschpe@suse.de
+
+- Set license to SDPX style (Python-2.0)
+- Removed outdated %clean section
+- Simplified macro usage
+- Only package HTML documentation (not the doc sources)
+
 -------------------------------------------------------------------
 Thu Sep  1 08:46:05 UTC 2011 - saschpe@suse.de
 
diff --git a/python-FormEncode.spec b/python-FormEncode.spec
index 6b042ff..1a65cf7 100644
--- a/python-FormEncode.spec
+++ b/python-FormEncode.spec
@@ -20,21 +20,19 @@ Version:        1.2.4
 Release:        0
 Url:            http://formencode.org
 Summary:        HTML form validation, generation, and conversion package
-License:        PSF
+License:        Python-2.0
 Group:          Development/Languages/Python
 Source:         http://pypi.python.org/packages/source/F/FormEncode/FormEncode-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
 BuildRequires:  python-distribute
-%if 0%{?suse_version}
-%py_requires
-%if 0%{?suse_version} > 1110
-BuildArch:      noarch
-%endif
-%endif
 Provides:       python-formencode = %{version}
 Obsoletes:      python-formencode < %{version}
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%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
 FormEncode validates and converts nested structures. It allows for
@@ -44,7 +42,7 @@ for filling and generating forms.
 %prep
 %setup -q -n FormEncode-%{version}
 mv docs/_build docs/html # Use a better name for HTML docs
-sed -i "s/\r//" docs/modules/national.txt # Fix EOL encoding
+sed -i "s/\r$//" docs/modules/national.txt # Fix EOL encoding
 
 %build
 python setup.py build
@@ -52,12 +50,9 @@ python setup.py build
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
-%doc docs/*
+%doc docs/html
 %{python_sitelib}/*
 
 %changelog