diff --git a/.cvsignore b/.cvsignore
index 1d1c144..2fc87ce 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-midori-0.1.4.tar.bz2
+midori-0.1.5.tar.bz2
diff --git a/midori.spec b/midori.spec
index daf6811..f50311c 100644
--- a/midori.spec
+++ b/midori.spec
@@ -1,6 +1,6 @@
 Name:		midori
-Version:	0.1.4
-Release:	2%{?dist}
+Version:	0.1.5
+Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
@@ -25,8 +25,9 @@ BuildRequires:	perl(XML::Parser)
 BuildRequires:	python-docutils
 BuildRequires:	sqlite-devel
 BuildRequires:	unique-devel
-BuildRequires:	waf >= 1.5
-BuildRequires:	WebKit-gtk-devel
+## XXX: Using the system waf makes it fail to build (python error).
+# BuildRequires:	waf >= 1.5
+BuildRequires:	webkitgtk-devel >= 1.1.1
 
 %description
 Midori is a lightweight web browser, and has many features expected of a
@@ -46,21 +47,22 @@ implemented, and some are still quite incomplete.
 %prep
 %setup -q
 ## Use the system-provided waf, instead of the in-tarball copy.
-rm -rf waf
+#rm -rf waf
 
 
 %build
 export CFLAGS="%{optflags}"
-waf	--prefix=%{_usr}			\
+./waf	--prefix=%{_usr}			\
 	--docdir=%{_docdir}/%{name}-%{version}	\
 	--libdir=%{_libdir}			\
-	configure
-waf %{?_smp_mflags} build
+	configure				\
+		--disable-unique
+./waf %{?_smp_mflags} build
 
 
 %install
 rm -rf %{buildroot}
-waf --destdir=%{buildroot} install
+./waf --destdir=%{buildroot} install
 %find_lang %{name}
 desktop-file-install					\
 	--vendor fedora					\
@@ -101,6 +103,13 @@ fi
 
 
 %changelog
+* Sat Apr 11 2009 Peter Gordon <peter@thecodergeek.com> - 0.1.5-2
+- Update to new upstream release (0.1.5): download support (with WebKitGTK
+  1.1.3+), a new "Colorful Tabs" extension, and saving of extension settings.
+- Temporarily switch to building using the in-tarball waf (FTBFS otherwise).
+- Temporarily disable libunique (single-instance) support, as it's broken
+  with libunique 1.0.4 (which is the current in rawhide).
+
 * Tue Mar 10 2009 Peter Gordon <peter@thecodergeek.com> - 0.1.4-2
 - Build against the recently-updated libidn for proper IDN support.
 
diff --git a/sources b/sources
index 280266c..3f1fbf9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9b21027ba894fed3055d7074c5f073d  midori-0.1.4.tar.bz2
+dccaddeb49d7def8a19cf497cb7eabf8  midori-0.1.5.tar.bz2