diff --git a/general/prog/jdk.xml b/general/prog/jdk.xml
index 9f42c69e14..e0b7224485 100644
--- a/general/prog/jdk.xml
+++ b/general/prog/jdk.xml
@@ -111,7 +111,7 @@
       </listitem>
       <listitem>
         <para><ulink
-        url="&patch-root;/jdk-&jdk-src-version;-motif_mkmsgcat-1.patch"/></para>
+        url="&patch-root;/jdk-&jdk-src-version;-motif_fixes-1.patch"/></para>
       </listitem>
       <listitem>
         <para><ulink
@@ -144,14 +144,16 @@
       <listitem>
         <para><ulink
         url="&patch-root;/jdk-&jdk-src-version;-xorg-6.8.1-1.patch"/>
-        (only required if building against <xref linkend="xorg"/>)</para>
+        (only required if building against <xref linkend="xorg"/> or 
+         <xref linkend="xorg7"/>)</para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">JDK Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required (to Build JDK from Source)</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    <para role="required">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
+    or <xref linkend="xorg7"/>),
     <xref linkend="zip"/>,
     <xref linkend="unzip"/>,
     <xref linkend="cpio"/>,
@@ -227,6 +229,12 @@ done</userinput></screen>
     do patch -Np1 -i ${PATCH}
 done</userinput></screen>
 
+    <para>If your X Window System is installed in any prefix other than
+    <filename class="directory">/usr/X11R6</filename>, adjust as necessary and
+    execute the following command:</para>
+
+<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable>[/usr]</replaceable>@g' {} \;</userinput></screen>
+
     <para>Set/unset some variables which affect the build:</para>
 
 <screen><userinput>export ALT_BOOTDIR="$JAVA_HOME" &amp;&amp;