diff --git a/.cvsignore b/.cvsignore
index f7c377f..cdac296 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 libXext-1.0.99.1.tar.bz2
+libXext-1.0.99.2.tar.bz2
diff --git a/fix.patch b/fix.patch
new file mode 100644
index 0000000..fc6731a
--- /dev/null
+++ b/fix.patch
@@ -0,0 +1,36 @@
+diff -up libXext-1.0.99.2/src/DPMS.c.jx libXext-1.0.99.2/src/DPMS.c
+--- libXext-1.0.99.2/src/DPMS.c.jx	2009-07-15 23:33:08.000000000 -0400
++++ libXext-1.0.99.2/src/DPMS.c	2009-07-16 17:17:34.000000000 -0400
+@@ -38,7 +38,7 @@ Equipment Corporation.
+ #endif
+ #include <X11/Xlibint.h>
+ #include <X11/extensions/dpms.h>
+-#include <X11/extensions/dpmsstr.h>
++#include <X11/extensions/dpmsproto.h>
+ #include <X11/extensions/Xext.h>
+ #include <X11/extensions/extutil.h>
+ #include <stdio.h>
+diff -up libXext-1.0.99.2/src/XMultibuf.c.jx libXext-1.0.99.2/src/XMultibuf.c
+--- libXext-1.0.99.2/src/XMultibuf.c.jx	2009-07-15 23:33:08.000000000 -0400
++++ libXext-1.0.99.2/src/XMultibuf.c	2009-07-16 17:19:02.000000000 -0400
+@@ -36,7 +36,7 @@ in this Software without prior written a
+ #include <stdio.h>
+ #include <X11/extensions/Xext.h>
+ #include <X11/extensions/extutil.h>
+-#include <X11/extensions/multibufst.h>
++#include <X11/extensions/multibufproto.h>
+ #include <X11/extensions/multibuf.h>
+ 
+ static XExtensionInfo _multibuf_info_data;
+diff -up libXext-1.0.99.2/src/XSecurity.c.jx libXext-1.0.99.2/src/XSecurity.c
+--- libXext-1.0.99.2/src/XSecurity.c.jx	2009-07-15 23:33:08.000000000 -0400
++++ libXext-1.0.99.2/src/XSecurity.c	2009-07-16 17:19:32.000000000 -0400
+@@ -33,7 +33,7 @@ in this Software without prior written a
+ #include <stdio.h>
+ #include <X11/extensions/Xext.h>
+ #include <X11/extensions/extutil.h>
+-#include <X11/extensions/securstr.h>
++#include <X11/extensions/securproto.h>
+ #include <X11/extensions/security.h>
+ 
+ static XExtensionInfo _Security_info_data;
diff --git a/libXext.spec b/libXext.spec
index 436032b..e6bdad7 100644
--- a/libXext.spec
+++ b/libXext.spec
@@ -1,14 +1,15 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
-Version: 1.0.99.1
-Release: 2%{?dist}
+Version: 1.0.99.2
+Release: 0%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-Source0: http://cgit.freedesktop.org/xorg/lib/libXext/snapshot/libXext-1.0.99.1.tar.bz2 
+Source0: http://cgit.freedesktop.org/xorg/lib/libXext/snapshot/libXext-1.0.99.2.tar.bz2 
+Patch0: fix.patch
 
 BuildRequires: xorg-x11-proto-devel >= 7.1-10
 BuildRequires: libX11-devel
@@ -35,6 +36,7 @@ X.Org X11 libXext development package
 
 %prep
 %setup -q
+%patch0 -p1 -b .jx
 
 %build
 ./autogen.sh
@@ -63,12 +65,35 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
+%{_includedir}/X11/extensions/MITMisc.h
+%{_includedir}/X11/extensions/XEVI.h
+%{_includedir}/X11/extensions/XLbx.h
+%{_includedir}/X11/extensions/XShm.h
+%{_includedir}/X11/extensions/XTest.h
+%{_includedir}/X11/extensions/Xag.h
+%{_includedir}/X11/extensions/Xcup.h
+%{_includedir}/X11/extensions/Xdbe.h
+%{_includedir}/X11/extensions/Xext.h
+%{_includedir}/X11/extensions/Xge.h
+%{_includedir}/X11/extensions/dpms.h
+%{_includedir}/X11/extensions/extutil.h
+%{_includedir}/X11/extensions/lbxbuf.h
+%{_includedir}/X11/extensions/lbxbufstr.h
+%{_includedir}/X11/extensions/lbximage.h
+%{_includedir}/X11/extensions/multibuf.h
+%{_includedir}/X11/extensions/security.h
+%{_includedir}/X11/extensions/shape.h
+%{_includedir}/X11/extensions/sync.h
+%{_includedir}/X11/extensions/xtestext1.h
 %{_libdir}/libXext.so
 %{_libdir}/pkgconfig/xext.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jul 21 2009 Adam Jackson <ajax@redhat.com> 1.0.99.2-0
+- libXext snapshot
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.99.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 63b1a2b..4a6f7b6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 28a0c215dca5960405634242e0f5957c  libXext-1.0.99.1.tar.bz2
+520ca5f70db34767075db3366e1440e3  libXext-1.0.99.2.tar.bz2