Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6c787dede03a806d35286d4a2a80010f7b6e2b6d)
+++ introduction/welcome/changelog.xml	(revision ecef83ed3ced153c3599a31e85e3e87b0192c655)
@@ -46,4 +46,9 @@
       <itemizedlist>
         <listitem>
+          <para>[dnicholson] - Patchlevel upgrades to the Xorg-7
+          packages. Removed unneeded patches encompassed in these
+          updates. See #2225 for more details.</para>
+        </listitem>
+        <listitem>
           <para>[dnicholson] - Changed the download location for the
           Xorg-7 wget lists and md5sums file.</para>
Index: x/installing/luit.xml
===================================================================
--- x/installing/luit.xml	(revision 6c787dede03a806d35286d4a2a80010f7b6e2b6d)
+++ x/installing/luit.xml	(revision ecef83ed3ced153c3599a31e85e3e87b0192c655)
@@ -7,6 +7,6 @@
   <!ENTITY luit-download-http "http://xorg.freedesktop.org/releases/individual/app/luit-&luit-version;.tar.bz2">
   <!ENTITY luit-download-ftp  "ftp://ftp.x.org/pub/individual/app/luit-&luit-version;.tar.bz2">
-  <!ENTITY luit-md5sum        "fbe44e739590d3d73f711bfc8a0e33fd">
-  <!ENTITY luit-size          "92 KB">
+  <!ENTITY luit-md5sum        "aacda46598ce3af8ca16e2a8132db1b2">
+  <!ENTITY luit-size          "97 KB">
   <!ENTITY luit-buildsize     "1 MB">
   <!ENTITY luit-time          "0.1 SBU">
@@ -72,13 +72,7 @@
     href="../../xincludes/xorg7-only.xml"/>
 
-    <para>A patch is required to fix a race condition in
-    <application>luit</application> that was discovered shortly after
-    release.  Download the patch from
-    <ulink url="&patch-root;/luit-&luit-version;-race-1.patch"/>.</para>
-
     <para>Install luit with the following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../luit-&luit-version;-race-1.patch &amp;&amp;
-./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision 6c787dede03a806d35286d4a2a80010f7b6e2b6d)
+++ x/installing/x7app.xml	(revision ecef83ed3ced153c3599a31e85e3e87b0192c655)
@@ -57,20 +57,8 @@
     </itemizedlist>
 
-    <!-- Following four patches are security related and should be
+    <!-- Following patch is security related and should be
         fixed for Xorg-7.2 -->
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/xdm-1.0.4-setuid-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/xf86dga-1.0.1-setuid-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/xinit-1.0.2-setuid-1.patch"/></para>
-      </listitem>
       <listitem>
         <para>Required patch: <ulink
@@ -111,23 +99,8 @@
 
     <para>A <ulink url='http://wiki.x.org/wiki/SecurityPage'>security
-    vulnerability</ulink> has been identified in the xdm, xf86dga, xinit
-    and xload packages. Before building these packages with the commands
-    shown below, be sure to apply the supplied patches. For xdm, this can be
-    accomplished with with the following command:</para>
-
-<screen><userinput>patch -Np1 -i ../xdm-1.0.4-setuid-1.patch</userinput></screen>
-
-    <para>For xf86dga, the patch can be applied with the following
-    command:</para>
-
-<screen><userinput>patch -Np1 -i ../xf86dga-1.0.1-setuid-1.patch</userinput></screen>
-
-    <para>For xinit, the patch can be applied with the following
-    command:</para>
-
-<screen><userinput>patch -Np1 -i ../xinit-1.0.2-setuid-1.patch</userinput></screen>
-
-    <para>For xload, the patch can be applied with the following
-    command:</para>
+    vulnerability</ulink> has been identified in the xload package.
+    Before building this package with the commands
+    shown below, be sure to apply the supplied patches. The patch can be
+    applied with with the following command:</para>
 
 <screen><userinput>patch -Np1 -i ../xload-1.0.1-setuid-1.patch</userinput></screen>
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision 6c787dede03a806d35286d4a2a80010f7b6e2b6d)
+++ x/installing/x7lib.xml	(revision ecef83ed3ced153c3599a31e85e3e87b0192c655)
@@ -56,16 +56,8 @@
     </itemizedlist>
 
-    <!-- Following three patches are security related and should be
+    <!-- Following patch is security related and has been
         fixed for Xorg-7.2 -->
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/libX11-1.0.1-setuid-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/xtrans-1.0.0-setuid-1.patch"/></para>
-      </listitem>
       <listitem>
         <para>Required patch: <ulink
@@ -108,19 +100,8 @@
 
     <para><ulink url='http://wiki.x.org/wiki/SecurityPage'>Security
-    vulnerabilities</ulink> have been identified in the libX11, xtrans
-    and libXfont packages. Before building these packages with the
-    commands shown below, be sure to apply the supplied patches.
-    For libX11, this can be accomplished with with the following
-    command:</para>
-
-<screen><userinput>patch -Np1 -i ../libX11-1.0.1-setuid-1.patch</userinput></screen>
-
-    <para>For xtrans, the patch can be applied with the following
-    command:</para>
-
-<screen><userinput>patch -Np1 -i ../xtrans-1.0.0-setuid-1.patch</userinput></screen>
-
-    <para>For libXfont, the patch can be applied with the following
-    command:</para>
+    vulnerabilities</ulink> have been identified in the libXfont package.
+    Before building this package with the commands shown below, be sure
+    to apply the supplied patches. This can be accomplished with with the
+    following command:</para>
 
 <screen><userinput>patch -Np1 -i ../libXfont-1.1.0-cidfonts-1.patch</userinput></screen>
Index: x/installing/x7server.xml
===================================================================
--- x/installing/x7server.xml	(revision 6c787dede03a806d35286d4a2a80010f7b6e2b6d)
+++ x/installing/x7server.xml	(revision ecef83ed3ced153c3599a31e85e3e87b0192c655)
@@ -7,6 +7,6 @@
   <!ENTITY xorg-server-download-http "http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "ftp://ftp.x.org/pub/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "d070c58a598fb52c5cb86344725c4ad6">
-  <!ENTITY xorg-server-size          "6.1 MB">
+  <!ENTITY xorg-server-md5sum        "a8ed678677af8ebb2fba5624602f6b2e">
+  <!ENTITY xorg-server-size          "6.0 MB">
   <!ENTITY xorg-server-buildsize     "424 MB">
   <!ENTITY xorg-server-time          "5.6 SBU">
@@ -62,5 +62,5 @@
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/xorg-server-1.1.0-security-1.patch"/></para>
+        url="&patch-root;/xorg-server-&xorg-server-version;-security-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -106,10 +106,10 @@
  End remove -->
 
-    <para>Multiple <ulink url='http://wiki.x.org/wiki/SecurityPage'>security
-    vulnerabilities</ulink> have been identified in the xorg-server
-    package. Apply a patch to fix these vulnerabilities with the following
+    <para>A <ulink url='http://wiki.x.org/wiki/SecurityPage'>security
+    vulnerability</ulink> have been identified in the xorg-server
+    package. Apply a patch to fix this vulnerabily with the following
     command:</para>
 
-<screen><userinput>patch -Np1 -i ../xorg-server-1.1.0-security-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-security-1.patch</userinput></screen>
 
     <para>Install the server by running the following commands:</para>
