diff --git a/.gitignore b/.gitignore
index 9433f4b..756675a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.9.15.tar.gz
 /libguestfs-1.9.16.tar.gz
 /libguestfs-1.9.17.tar.gz
+/libguestfs-1.9.18.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index 95d8cf0..c7619c3 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -29,8 +29,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.9.17
-Release:       2%{?dist}
+Version:       1.9.18
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -62,6 +62,9 @@ BuildRequires: gperf
 BuildRequires: db4-utils
 BuildRequires: cpio
 BuildRequires: libconfig-devel
+BuildRequires: ocaml
+BuildRequires: ocaml-findlib-devel
+BuildRequires: ocaml-pcre-devel
 
 # This is only needed for RHEL 5 because readline-devel doesn't
 # properly depend on it, but doesn't do any harm on other platforms:
@@ -99,8 +102,6 @@ Requires:      grub, ntfsprogs
 
 # These are only required if you want to build the bindings for
 # different languages:
-BuildRequires: ocaml
-BuildRequires: ocaml-findlib-devel
 BuildRequires: perl-devel
 BuildRequires: perl-Test-Simple
 BuildRequires: perl-Test-Pod
@@ -616,7 +617,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/libguestfs-test-tool
 %{_libdir}/guestfs/
 %{_libdir}/libguestfs.so.*
-%{_libexecdir}/libguestfs-test-tool-helper
 %{_mandir}/man1/libguestfs-test-tool.1*
 
 
@@ -772,6 +772,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr  9 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.18-1
+- New upstream version 1.9.18.
+- Requires ocaml-pcre for new virt-resize.
+- Remove libguestfs-test-tool-helper program which is no longer used.
+
 * Wed Apr  6 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.9.17-2
 - Remove partially translated Ukrainian manpages.
 
diff --git a/sources b/sources
index a0bb54d..b62dbca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da9472d7df90dcb57067269fd3258101  libguestfs-1.9.17.tar.gz
+eae14df1f709355d012527588b010038  libguestfs-1.9.18.tar.gz