diff --git a/.gitignore b/.gitignore
index e41b612..b875f45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /waf-1.8.5.stripped.tar.bz2
 /waf-1.8.6.stripped.tar.bz2
 /waf-1.8.7.stripped.tar.bz2
+/waf-1.8.8.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index ff330b4..296f3db 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-version=1.8.7
+version=1.8.8
 prerel=
 
 src=waf-${version}${prerel}.tar.bz2
diff --git a/sources b/sources
index 9429986..7d3f8af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd1ab8ca1c5be6d79b17124df0ad64f5  waf-1.8.7.stripped.tar.bz2
+c4d59b3101047ad6e1cccfe0d037b8d7  waf-1.8.8.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index ff4f202..1d340c9 100644
--- a/waf.spec
+++ b/waf.spec
@@ -13,7 +13,7 @@
 %undefine prerel
 
 Name:           waf
-Version:        1.8.7
+Version:        1.8.8
 Release:        %{?prerel:0.}1%{?prerel:.%prerel}%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
@@ -21,7 +21,8 @@ Group:          Development/Tools
 License:        BSD and Python
 URL:            http://code.google.com/p/waf/
 # Original tarfile can be found at
-# http://ftp.waf.io/pub/release/waf-%%{version}.tar.bz2
+# https://waf.io/waf-%%{version}.tar.bz2 or
+# http://www.freehackers.org/%7Etnagy/release/waf-%%{version}.tar.bz2
 # We remove:
 # - docs/book, licensed CC BY-NC-ND
 # - Waf logos, licensed CC BY-NC
@@ -31,7 +32,7 @@ Patch1:         waf-1.6.9-logo.patch
 
 BuildArch:      noarch
 
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
 %endif # with_python3
@@ -44,10 +45,10 @@ BuildRequires:  python-sphinx10
 BuildRequires:  graphviz
 BuildRequires:  ImageMagick
 %endif # with_docs
-%if "%{?python_version}" != ""
+%if "%{?python2_version}" != ""
 # Seems like automatic ABI dependency is not detected since the files are
 # going to a non-standard location
-Requires:       python(abi) = %{python_version}
+Requires:       python(abi) = %{python2_version}
 %endif
 
 
@@ -134,12 +135,13 @@ popd
 # use waf so it unpacks itself
 mkdir _temp ; pushd _temp
 cp -av ../waf .
-%{__python} ./waf >/dev/null 2>&1
+%{__python2} ./waf >/dev/null 2>&1
 pushd .waf-%{version}-*
 find . -name '*.py' -printf '%%P\0' |
   xargs -0 -I{} install -m 0644 -p -D {} %{buildroot}%{_datadir}/waf/{}
 popd
 %if 0%{?with_python3}
+# use waf so it unpacks itself
 %{__python3} ./waf >/dev/null 2>&1
 pushd .waf3-%{version}-*
 find . -name '*.py' -printf '%%P\0' |
@@ -149,18 +151,18 @@ popd
 popd
 
 # install the frontend
-install -m 0755 -p -D waf-light %{buildroot}%{_bindir}/waf-%{python_version}
+install -m 0755 -p -D waf-light %{buildroot}%{_bindir}/waf-%{python2_version}
 %if 0%{?with_python3}
 install -m 0755 -p -D waf-light %{buildroot}%{_bindir}/waf-%{python3_version}
 %endif # with_python3
-ln -s waf-%{python_version} %{buildroot}%{_bindir}/waf
+ln -s waf-%{python2_version} %{buildroot}%{_bindir}/waf
 
 # remove shebangs from and fix EOL for all scripts in wafadmin
 find %{buildroot}%{_datadir}/ -name '*.py' \
      -exec sed -i -e '1{/^#!/d}' -e 's|\r$||g' {} \;
 
 # fix waf script shebang line
-sed -i "1c#! %{__python}" %{buildroot}%{_bindir}/waf-%{python_version}
+sed -i "1c#! %{__python2}" %{buildroot}%{_bindir}/waf-%{python2_version}
 %if 0%{?with_python3}
 sed -i "1c#! %{__python3}" %{buildroot}%{_bindir}/waf-%{python3_version}
 %endif # with_python3
@@ -173,7 +175,7 @@ rm -f docs/sphinx/build/html/.buildinfo
 
 %if 0%{?with_python3}
 # do byte compilation
-%py_byte_compile %{__python} %{buildroot}%{_datadir}/waf
+%py_byte_compile %{__python2} %{buildroot}%{_datadir}/waf
 %py_byte_compile %{__python3} %{buildroot}%{_datadir}/waf3
 %endif # with_python3
 
@@ -181,7 +183,7 @@ rm -f docs/sphinx/build/html/.buildinfo
 %files
 %doc README TODO ChangeLog demos
 %{_bindir}/waf
-%{_bindir}/waf-%{python_version}
+%{_bindir}/waf-%{python2_version}
 %{_datadir}/waf
 
 
@@ -199,6 +201,10 @@ rm -f docs/sphinx/build/html/.buildinfo
 
 
 %changelog
+* Sun Apr 19 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.8-1
+- Update to 1.8.8.
+- Apply updated Python packaging guidelines.
+
 * Sun Mar  1 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.7-1
 - Update to 1.8.7.