diff --git a/.gitignore b/.gitignore
index df6b61b..f2de5eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/waf-1.6.11.stripped.tar.bz2
+/waf-1.7.0pre3.stripped.tar.bz2
diff --git a/repack.sh b/repack.sh
index 6170517..2d7ba3f 100755
--- a/repack.sh
+++ b/repack.sh
@@ -1,8 +1,9 @@
 #! /bin/bash
 
-version=1.6.11
+version=1.7.0
+prerel=pre3
 
-src=waf-${version}.tar.bz2
+src=waf-${version}${prerel}.tar.bz2
 dst=${src%.tar.bz2}.stripped.tar.bz2
 
 rm -f ${dst} ${dst%.bz2}
@@ -12,7 +13,6 @@ bzip2 -d ${dst}
 
 tar --delete --file=${dst%.bz2} \
      waf-${version}/docs/book \
-     waf-${version}/waflib/extras/subprocess.py \
      waf-${version}/docs/sphinx/_images/waf-64x64.png \
      waf-${version}/docs/gfx/waflogo.svg \
      waf-${version}/docs/slides/presentation/gfx/waflogo.svg
diff --git a/sources b/sources
index 44b307e..b1acc8b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87a22e5dd54e36e164fb2e44007b11b2  waf-1.6.11.stripped.tar.bz2
+07bbf9ac9848809999bd9036ebef601f  waf-1.7.0pre3.stripped.tar.bz2
diff --git a/waf.spec b/waf.spec
index 028703f..2abe98c 100644
--- a/waf.spec
+++ b/waf.spec
@@ -9,9 +9,12 @@
 # available)
 %global with_docs 1
 
+# For pre-releases
+%global prerel pre3
+
 Name:           waf
-Version:        1.6.11
-Release:        1%{?dist}
+Version:        1.7.0
+Release:        0.1.%{prerel}%{?dist}
 Summary:        A Python-based build system
 Group:          Development/Tools
 # The entire source code is BSD apart from pproc.py (taken from Python 2.5)
@@ -22,14 +25,14 @@ URL:            http://code.google.com/p/waf/
 # We remove:
 # - /docs/book, as this is under CC-BY-NC-ND, which is not allowed in
 #   Fedora
-# - /waflib/extras/subprocess.py, is under a Python license and not
-#   needed in Fedora
-Source:         waf-%{version}.stripped.tar.bz2
+# - Waf logos
+Source:         waf-%{version}%{prerel}.stripped.tar.bz2
 # use _datadir instead of /usr/lib
 Patch0:         waf-1.6.2-libdir.patch
 Patch1:         waf-1.6.9-logo.patch
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
 BuildArch:      noarch
+
 BuildRequires:  python-devel
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
@@ -82,10 +85,16 @@ This package contains the Python 3 version of %{name}.
 
 
 %if 0%{?with_docs}
-%package -n %{name}-docs
+%package -n %{name}-doc
 Summary:        Documentation for %{name}
-
-%description -n %{name}-docs
+Requires:       %{name} = %{version}-%{release}
+# obsolete the previous docs subpackage - guideline specifies -doc
+# since: Fedora 18, RHEL 7 (mark the provides/obsoletes RHEL only after
+# we no longer need to provide upgrade paths from affected Fedora releases)
+Provides:       %{name}-docs = %{version}-%{release}
+Obsoletes:      %{name}-docs < 1.6.11-2
+
+%description -n %{name}-doc
 Waf is a Python-based framework for configuring, compiling and
 installing applications. It is a replacement for other tools such as
 Autotools, Scons, CMake or Ant.
@@ -101,6 +110,9 @@ This package contains the HTML documentation for %{name}.
 
 
 %build
+# ticgt trips up build, see 
+# http://code.google.com/p/waf/issues/detail?id=1171
+mv waflib/extras/ticgt.py{,.off}
 extras=
 for f in waflib/extras/*.py ; do
   f=$(basename "$f" .py);
@@ -122,8 +134,6 @@ popd
 
 
 %install
-rm -rf %{buildroot}
-
 # use waf so it unpacks itself
 mkdir _temp ; pushd _temp
 cp -av ../waf .
@@ -192,13 +202,18 @@ rm -rf %{buildroot}
 
 
 %if 0%{?with_docs}
-%files -n %{name}-docs
+%files -n %{name}-doc
 %defattr(-,root,root,-)
 %doc docs/sphinx/build/html
 %endif # with_docs
 
 
 %changelog
+* Thu Jun  7 2012 Michel Salim <salimma@fedoraproject.org> - 1.7.0-0.1.pre3
+- Update to 1.7.0pre3
+- Spec clean-up
+- Rename -docs subpackage to -doc, per guidelines
+
 * Mon Feb  6 2012 Michel Salim <salimma@fedoraproject.org> - 1.6.11-1
 - Update to 1.6.11
 - Build in verbose mode