diff --git a/flickrapi-1.3.tar.bz2 b/flickrapi-1.3.tar.bz2
deleted file mode 100644
index 8527428..0000000
--- a/flickrapi-1.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80a4b90740279cbd3a95db43f44ccd087a5e828ae45fb9f0af153164e7b202a5
-size 35083
diff --git a/flickrapi-1.4.2.zip b/flickrapi-1.4.2.zip
new file mode 100644
index 0000000..deb9169
--- /dev/null
+++ b/flickrapi-1.4.2.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac9304f571175b8af4fc2ee17d3e110847b526640665ca53d97bbf9df98329bc
+size 79045
diff --git a/python-flickrapi.changes b/python-flickrapi.changes
index ac5b8d9..d07f39e 100644
--- a/python-flickrapi.changes
+++ b/python-flickrapi.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Sep 21 09:14:44 UTC 2011 - saschpe@suse.de
+
+- Update to version 1.4.0:
+  * No changes provided by upstream
+- Spec file cleanup:
+  * Proper suse version checks
+  * Removed old stuff (%clean section)
+  * Corrected docs install location, generate HTML docs
+  * Obsolete doc package, ship in base package
+  * Fix non-executable bit rpmlint warning
+
 -------------------------------------------------------------------
 Fri Sep  3 12:53:58 UTC 2010 - jmatejek@novell.com
 
diff --git a/python-flickrapi.spec b/python-flickrapi.spec
index 5ebdc54..7f073fa 100644
--- a/python-flickrapi.spec
+++ b/python-flickrapi.spec
@@ -11,34 +11,38 @@
 # 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/
 #
 
-# norootforbuild
-
 
 Name:           python-flickrapi
-%define _name   flickrapi
+Version:        1.4.2
+Release:        0
+Url:            http://stuvel.eu/projects/flickrapi
+Summary:        Python interface to Flickr
 License:        Python 2.5 license
 Group:          Development/Libraries/Python
-Version:        1.3
-Release:        1
-Summary:        Python interface to Flickr
-Url:            http://stuvel.eu/projects/flickrapi
-Source:         %{_name}-%{version}.tar.bz2
+Source:         flickrapi-%{version}.zip
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  docutils
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+BuildRequires:  python-distribute
 BuildRequires:  python-xml
+BuildRequires:  unzip
 Requires:       python-xml
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version}
 %py_requires
-%if %suse_version <= 1110
-%define python_sitelib %{py_sitedir}
-%else
+%if 0%{?suse_version} > 1010
+BuildRequires:  fdupes
+%endif
+%if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
+%endif
+Provides:       python-flickrapi-doc = %{version}
+Obsoletes:      python-flickrapi-doc < %{version}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 The easiest to use, most complete, and most actively developed
@@ -46,38 +50,21 @@ Python interface to the Flickr API. It includes support for
 authorized and non-authorized access, uploading and replacing
 photos, and all Flickr API functions.
 
-%package doc
-License:        Python 2.5 license
-Group:          Development/Libraries/Python
-Summary:        Python interface to Flickr - Documentation
-Requires:       %{name} = %{version}
-
-%description doc
-The easiest to use, most complete, and most actively developed
-Python interface to the Flickr API. It includes support for
-authorized and non-authorized access, uploading and replacing
-photos, and all Flickr API functions.
-
 %prep
-%setup -q -n %{_name}-%{version}
+%setup -q -n flickrapi-%{version}
+sed -i "1d" flickrapi/__init__.py # Fix non-executable script
 
 %build
-%{__python} setup.py build
+python setup.py build
+cd doc && make # Build HTML documentation
 
 %install
-%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot}
-
-%clean
-%{__rm} -rf %{buildroot}
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+rm -rf %{buildroot}/usr/{{LICENSE,README,UPGRADING},share/doc/flickrapi-%{version}} # Remove wrongly installed documentation
 
 %files
 %defattr(-,root,root)
 %doc LICENSE README UPGRADING
-%{python_sitelib}/%{_name}-%{version}-py%{py_ver}.egg-info
-%{python_sitelib}/%{_name}/
-
-%files doc
-%defattr(-,root,root)
-%{_datadir}/doc/%{_name}-%{version}
+%{python_sitelib}/*
 
 %changelog