diff --git a/libwmf-0.2.8.4-useafterfree.patch b/libwmf-0.2.8.4-useafterfree.patch
new file mode 100644
index 0000000..328c541
--- /dev/null
+++ b/libwmf-0.2.8.4-useafterfree.patch
@@ -0,0 +1,10 @@
+--- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list	2009-04-24 04:06:44.000000000 -0400
++++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c	2009-04-24 04:08:30.000000000 -0400
+@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe
+ 	{	more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle));
+ 		if (more == 0) return;
+ 		im->clip->max += 8;
++                im->clip->list = more;
+ 	}
+ 	im->clip->list[im->clip->count] = (*rect);
+ 	im->clip->count++;
diff --git a/libwmf.spec b/libwmf.spec
index e25a71f..d50a48d 100644
--- a/libwmf.spec
+++ b/libwmf.spec
@@ -1,7 +1,7 @@
 Summary: Windows MetaFile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 19%{?dist}
+Release: 20%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 Source: http://downloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@ Patch3: libwmf-0.2.8.4-deps.patch
 Patch4: libwmf-0.2.8.4-multiarchdevel.patch
 Patch5: libwmf-0.2.8.4-intoverflow.patch
 Patch6: libwmf-0.2.8.4-reducesymbols.patch
+Patch7: libwmf-0.2.8.4-useafterfree.patch
 Requires: urw-fonts
 Requires: %{name}-lite = %{version}-%{release}
 Requires(post): %{_bindir}/update-gdk-pixbuf-loaders
@@ -50,6 +51,7 @@ using libwmf.
 %patch4 -p1 -b .multiarchdevel
 %patch5 -p1 -b .intoverflow
 %patch6 -p1 -b .reducesymbols.patch
+%patch7 -p1 -b .useafterfree.patch
 f=README ; iconv -f iso-8859-2 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 %build
@@ -121,6 +123,9 @@ sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/fontmap -e 's#libwmf/fonts#fonts/
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Tue May 26 2009 Caolán McNamara <caolanm@redhat.com> - 0.2.8.4-20
+- Resolves: CVE-2009-1364
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.8.4-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild