diff --git a/python-versiontools.changes b/python-versiontools.changes
index c4535b3..b5e7483 100644
--- a/python-versiontools.changes
+++ b/python-versiontools.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Sep 21 18:24:32 UTC 2011 - saschpe@suse.de
+
+- Update to 1.8:
+  * Fixed all pep8 issues (prettier syntax)
+  * Fixed an issue with using __import__ on Python 2.4.
+  * Fixed an issue with using :versiontools:path.to.symbol with nested modules
+  * Fixed an issue with using exceptions on Python 3.x
+  * Added test that demostrated that exception handling works on all Python versions.
+  * Unified error handling across version control plugins.
+  * General documentation improvements, installation, usage, code refrerence,
+    and writing additional plug-ins.
+  * Added a *backwards incompatible* constraint on serial to be greater than
+    zero on alpha, beta and release candidates as required by :pep:`386`.
+- Fixed non-executable scripts rpmlint warning
+
 -------------------------------------------------------------------
 Thu Sep  8 01:49:15 UTC 2011 - alexandre@exatati.com.br
 
diff --git a/python-versiontools.spec b/python-versiontools.spec
index dc8b2b9..c87193c 100644
--- a/python-versiontools.spec
+++ b/python-versiontools.spec
@@ -15,29 +15,25 @@
 # 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 versiontools
-
-Name:           python-%{mod_name}
-Version:        1.7
+Name:           python-versiontools
+Version:        1.8
 Release:        0
 Url:            https://launchpad.net/versiontools
-Summary:        Smart Replacement for Plain Tuple Used in __version__
-License:        LGPLv3
+Summary:        Smart replacement for plain tuple used in __version__
+License:        LGPL-3.0+
 Group:          Development/Languages/Python
-Source:         %{mod_name}-%{version}.tar.bz2
+Source:         http://pypi.python.org/packages/source/v/versiontools/versiontools-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       python-distribute
 BuildRequires:  python-devel
 BuildRequires:  python-distribute
+Requires:       python-distribute
 %if 0%{?suse_version}
 %py_requires
 %if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
 %endif
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 Smart replacement for plain tuple used in __version__.
@@ -50,23 +46,19 @@ Smart replacement for plain tuple used in __version__.
   with PEP 386
 * Remain comparable as tuple of integers
 
-
 %prep
-%setup -q -n %{mod_name}-%{version}
+%setup -q -n versiontools-%{version}
+sed -i "1d" versiontools/{git_support,hg_support,bzr_support}.py # Fix non-executable scripts
 
 %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 doc
-%{python_sitelib}/%{mod_name}*
+%doc doc/*
+%{python_sitelib}/*
 
 %changelog
diff --git a/versiontools-1.7.tar.bz2 b/versiontools-1.7.tar.bz2
deleted file mode 100644
index 9ccdc1a..0000000
--- a/versiontools-1.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56a4b14a70161bdf6121547e7349fecf5da6c1970179a6ab2a19d327fc0705d6
-size 12823
diff --git a/versiontools-1.8.tar.gz b/versiontools-1.8.tar.gz
new file mode 100644
index 0000000..3d65108
--- /dev/null
+++ b/versiontools-1.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:585c5a8fa2cd7cffa5555d44075e4672a242a666b59eec3e25ba1cff05d97520
+size 16626