diff --git a/.gitignore b/.gitignore
index 96e4f69..e60a3af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ libguestfs-1.5.2.tar.gz
 /libguestfs-1.5.17.tar.gz
 /libguestfs-1.5.18.tar.gz
 /libguestfs-1.5.21.tar.gz
+/libguestfs-1.5.23.tar.gz
diff --git a/libguestfs-1.5.21-skip-test-copy.patch b/libguestfs-1.5.21-skip-test-copy.patch
deleted file mode 100644
index 58268cc..0000000
--- a/libguestfs-1.5.21-skip-test-copy.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1a3324ea2b0f4a4e04f99c4efb5af1d4cc256731 Mon Sep 17 00:00:00 2001
-From: Richard W.M. Jones <rjones@redhat.com>
-Date: Sat, 2 Oct 2010 09:10:22 +0100
-Subject: [PATCH 2/2] test-copy: Skip this test if /dev/fd is missing, because of broken mock 1.1.4.
-
----
- regressions/test-copy.sh |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/regressions/test-copy.sh b/regressions/test-copy.sh
-index 237acd0..6cfb3f1 100755
---- a/regressions/test-copy.sh
-+++ b/regressions/test-copy.sh
-@@ -18,6 +18,14 @@
- 
- # Test guestfish copy-in and copy-out commands.
- 
-+# This test fails on some versions of mock which lack /dev/fd
-+# directory.  Skip this test in that case.
-+
-+test -d /dev/fd || {
-+    echo "$0: Skipping this test because /dev/fd is missing."
-+    exit 0
-+}
-+
- set -e
- 
- rm -f test1.img
--- 
-1.7.3.1
-
diff --git a/libguestfs-1.5.21-skip-test-virt-resize.patch b/libguestfs-1.5.21-skip-test-virt-resize.patch
deleted file mode 100644
index a2e09a3..0000000
--- a/libguestfs-1.5.21-skip-test-virt-resize.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 887a79d1d1c47e537fdffd1208acbacd598b0f96 Mon Sep 17 00:00:00 2001
-From: Richard W.M. Jones <rjones@redhat.com>
-Date: Sat, 2 Oct 2010 09:07:42 +0100
-Subject: [PATCH 1/2] test-virt-resize: Skip this test on 32 bit hosts.
-
----
- tools/test-virt-resize.sh |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/tools/test-virt-resize.sh b/tools/test-virt-resize.sh
-index 75d5147..2c343cb 100755
---- a/tools/test-virt-resize.sh
-+++ b/tools/test-virt-resize.sh
-@@ -1,5 +1,12 @@
- #!/bin/bash -
- 
-+# virt-resize does not work on 32 bit because of limitations in Perl
-+# so short-circuit this test on a 32 bit host.
-+perl -e 'exit 1 if ~1 == 4294967294' || {
-+    echo "$0: Skipping this test on 32 bit."
-+    exit 0
-+}
-+
- export LANG=C
- set -e
- 
--- 
-1.7.3.1
-
diff --git a/libguestfs.spec b/libguestfs.spec
index c2b5e16..2a863f3 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -41,8 +41,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.5.21
-Release:       1%{?dist}.4
+Version:       1.5.23
+Release:       1
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -52,10 +52,6 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:        libguestfs-1.0.79-no-fuse-test.patch
 
-# Upstream patches to skip problematic tests in some circumstances.
-Patch1:        libguestfs-1.5.21-skip-test-copy.patch
-Patch2:        libguestfs-1.5.21-skip-test-virt-resize.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -414,8 +410,6 @@ php-%{name} contains PHP bindings for %{name}.
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 mkdir -p daemon/m4
 
@@ -745,6 +739,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Oct 23 2010 Richard Jones <rjones@redhat.com> - 1:1.5.23-1
+- Fix for libguestfs: missing disk format specifier when adding a disk
+  (RHBZ#642934, CVE-2010-3851).
+
 * Sat Oct  9 2010 Richard Jones <rjones@redhat.com> - 1:1.5.21-1.fc14.4
 - guestfish no longer requires virt-inspector.
 
diff --git a/sources b/sources
index d6cb1c7..5c91a63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-549166bb9093cefc3e2c42452444bd2d  libguestfs-1.5.21.tar.gz
+cfa4485737583cbf7991840d2441b0d6  libguestfs-1.5.23.tar.gz