diff --git a/python-sqlalchemy-migrate.changes b/python-sqlalchemy-migrate.changes
index ba54acc..3d2924c 100644
--- a/python-sqlalchemy-migrate.changes
+++ b/python-sqlalchemy-migrate.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 13:50:33 UTC 2011 - saschpe@suse.de
+
+- Make it a noarch package
+- Fixed dependencies
+- Build HTML documentation and install that
+
 -------------------------------------------------------------------
 Tue Nov 29 12:06:05 UTC 2011 - idoenmez@suse.de
 
diff --git a/python-sqlalchemy-migrate.spec b/python-sqlalchemy-migrate.spec
index b69f80b..196c53a 100644
--- a/python-sqlalchemy-migrate.spec
+++ b/python-sqlalchemy-migrate.spec
@@ -20,21 +20,24 @@
 
 Name:           python-sqlalchemy-migrate
 Version:        0.7.1
-Release:        1
+Release:        0
 License:        MIT
 Summary:        Database schema migration for SQLAlchemy
 Url:            http://pypi.python.org/pypi/sqlalchemy-migrate
 Group:          Development/Libraries/Python
 Source:         http://pypi.python.org/packages/source/s/sqlalchemy-migrate/sqlalchemy-migrate-0.7.1.tar.gz
-BuildRequires:  python-py
-BuildRequires:  python-setuptools
+BuildRequires:  python-Sphinx >= 0.5
+BuildRequires:  python-distribute
+Requires:       python-SQLAlchemy >= 0.5
+Requires:       python-Tempita
 Requires:       python-decorator
 Requires:       python-nose >= 0.10
-Requires:       python-sphinx >= 0.5
-Requires:       python-sqlalchemy >= 0.5
-Requires:       python-tempita
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %py_requires
+%if 0%{?suse_version} > 1110
+BuildArch:      noarch
+%endif
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 Inspired by Ruby on Rails' migrations, Migrate provides a way to deal with
@@ -46,15 +49,20 @@ well as from inside python code.
 
 %prep
 %setup -q -n sqlalchemy-migrate-%{version}
+find . -type f -name "*.py" -o -name "*.py_tmpl" | xargs sed -i "1d" # Fix non-executable scripts
 
 %build
 python setup.py build
+cd docs && make html && rm _build/html/.buildinfo # Build HTML documentation
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=filelist
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-%files -f filelist
+%files
 %defattr(-,root,root)
-%doc PKG-INFO README docs
+%doc README docs/_build/html
+%{_bindir}/migrate
+%{_bindir}/migrate-repository
+%{python_sitelib}/*
 
 %changelog