diff --git a/libX11.spec b/libX11.spec
index d6a96d2..6813344 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -1,13 +1,16 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
+
 Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
+Patch1: libX11-1.0.1-setuid.diff
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
@@ -18,8 +21,7 @@ BuildRequires: libXdmcp-devel
 # NOTE: Temporary BuildRequires needed for build time kludges.
 BuildRequires: autoconf
 
-# FIXME: check if still needed for X11R7
-Requires(pre): filesystem >= 2.3.6-1
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
 Obsoletes: XFree86-libs, xorg-x11-libs
 
@@ -43,6 +45,7 @@ X.Org X11 libX11 development package
 %prep
 %setup -q
 %patch0 -p0 -b .datadir-locale-dir-fix
+%patch1 -p1 -b .setuid
 
 # Disable static library creation by default.
 %define with_static 0
@@ -78,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README INSTALL ChangeLog
+%doc AUTHORS COPYING README INSTALL ChangeLog NEWS
 %dir %{_datadir}/X11
 %dir %{_datadir}/X11/locale
 %dir %{_datadir}/X11/locale/C
@@ -238,19 +241,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Tue Jun 20 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-3
+- Added libX11-1.0.1-setuid.diff to fix potential security issue (#196094)
+- Change dependency on "filesystem" package to "xorg-x11-filesystem" package,
+  so we can control this dep centrally.
+- Added NEWS to doc list.
+
 * Wed Jun 07 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
 - Remove package ownership of mandir/libdir/etc.
 
 * Fri May 12 2006 Adam Jackson <ajackson@redhat.com> 1.0.1-1
 - Bump to 1.0.1
 
-* Thu Feb 23 2006 Christopher Aillon <caillon@redhat.com> - 1.0.0-3
+* Thu Feb 23 2006 Christopher Aillon <caillon@redhat.com> 1.0.0-3
 - Look for the versioned libXcursor.so.1 (fixes 179044)
 
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.0.0-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-2.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.0.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1.0.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Sat Dec 24 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-2
@@ -272,7 +281,7 @@ rm -rf $RPM_BUILD_ROOT
 - Added libX11-0.99.3-datadir-locale-dir-fix.patch, to fix build to install
   the locale data files into datadir instead of libdir. (#173282)
 
-* Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> - 0.99.3-3
+* Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> 0.99.3-3
 - require newer filesystem package (#172610)
 
 * Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-2
@@ -283,7 +292,7 @@ rm -rf $RPM_BUILD_ROOT
 - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
 - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
 
-* Mon Nov 7 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2
+* Mon Nov 07 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2
 - Fix devel subpackage summary and description with s/libXdmcp/libX11/
 
 * Fri Oct 21 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
@@ -291,7 +300,7 @@ rm -rf $RPM_BUILD_ROOT
 - Added en_GR.UTF-8 locale to file manifest.
 - Forcibly remove Xcms.txt
 
-* Sun Oct  2 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-4
+* Sun Oct 02 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-4
 - Added _smp_mflags to make invocation to speed up SMP builds
 
 * Thu Sep 29 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-3