diff --git a/libguestfs.spec b/libguestfs.spec
index 66d2fcd..6142343 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -4,13 +4,16 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Version:     1.0.29
-Release:     1%{?dist}
+Release:     2%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://et.redhat.com/~rjones/libguestfs/
 Source0:     http://et.redhat.com/~rjones/libguestfs/files/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
+# Can be removed in 1.0.30:
+Source1:     test-bootbootboot.sh
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -237,6 +240,9 @@ Requires:    jpackage-utils
 %prep
 %setup -q
 
+# Can be removed in 1.0.30:
+cp -n %{SOURCE1} .
+
 mkdir -p daemon/m4
 
 
@@ -458,9 +464,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu May 21 2009 Richard Jones <rjones@redhat.com> - 1.0.29-1
+* Thu May 21 2009 Richard Jones <rjones@redhat.com> - 1.0.29-2
 - New upstream version 1.0.29 (fixes RHBZ#502007 RHBZ#502018).
 - This should allow us to enable tests for i386 and x86-64.
+- Added test-bootbootboot.sh script which was missed from 1.0.29 tarball.
 
 * Thu May 21 2009 Richard Jones <rjones@redhat.com> - 1.0.28-1
 - New upstream version 1.0.28.  Nothing has visibly changed, but
diff --git a/test-bootbootboot.sh b/test-bootbootboot.sh
new file mode 100755
index 0000000..616781a
--- /dev/null
+++ b/test-bootbootboot.sh
@@ -0,0 +1,41 @@
+#!/bin/sh -
+# libguestfs
+# Copyright (C) 2009 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+# Some versions of qemu can be flakey and can hang occasionally
+# during boot (particularly KVM if the BIOS is the qemu version
+# which doesn't have the required KVM patches).  Test repeatedly
+# booting.
+
+set -e
+
+rm -f test1.img
+dd if=/dev/zero of=test1.img bs=1024k count=500
+
+n=20
+if [ -n "$1" ]; then n=$1; fi
+
+export LIBGUESTFS_DEBUG=1
+
+for i in $(seq 1 $n); do
+  echo Test boot $i of $n ...
+  ./fish/guestfish -a test1.img run
+done
+
+rm test1.img
+
+echo Test boot completed after $n iterations.