Index: general/genutils/rxvt-unicode.xml
===================================================================
--- general/genutils/rxvt-unicode.xml	(revision 410e228bb92f0d8b31d74534aa505b80c8f96b36)
+++ general/genutils/rxvt-unicode.xml	(revision d357f93779a5ce485e04d758598ab32558ef6c55)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY rxvt-unicode-download-http "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-&rxvt-unicode-version;.tar.bz2">
+  <!ENTITY rxvt-unicode-download-http "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-&rxvt-unicode-version;.tar.bz2">
   <!ENTITY rxvt-unicode-download-ftp  " ">
   <!ENTITY rxvt-unicode-md5sum        "f3c4fea3d544a340fa5a1d601ff5f204">
   <!ENTITY rxvt-unicode-size          "860 KB">
-  <!ENTITY rxvt-unicode-buildsize     "18 MB">
+  <!ENTITY rxvt-unicode-buildsize     "27 MB">
   <!ENTITY rxvt-unicode-time          "0.2 SBU">
 ]>
@@ -56,4 +56,12 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/rxvt-unicode-&rxvt-unicode-version;-DISPLAY_fix-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">rxvt-unicode Dependencies</bridgehead>
 
@@ -62,8 +70,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <ulink url="http://www.afterstep.org/visualdoc.php?show=asimagexml">
-    libAfterImage</ulink> (adds support for libAfterImage to be used for
-    transparency and background images)</para>
+    <para role="optional"><ulink
+    url="http://sourceforge.net/projects/afterstep">libAfterImage</ulink>
+    (adds support for transparency and background images)</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -78,5 +85,6 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --enable-everything &amp;&amp;
+<screen><userinput>patch -Np1 -i ../rxvt-unicode-&rxvt-unicode-version;-DISPLAY_fix-1.patch &amp;&amp;
+./configure --prefix=/usr --enable-everything &amp;&amp;
 make</userinput></screen>
 
@@ -100,6 +108,5 @@
 
     <para><option>--disable-perl</option>: Disable the embedded
-    <application>Perl</application>
-    interpreter.</para>
+    <application>Perl</application> interpreter.</para>
 
     <para><option>--disable-afterimage</option>: Remove support for
@@ -113,21 +120,19 @@
     <para>The <application>rxvt-unicode</application> terminal emulator
     uses the resource class <classname>URxvt</classname> and the resource name
-    <classname>urxvt</classname>. You can add X resource definitions to the
-    user's <filename>~/.Xresources</filename> file, or to the system-wide
-    <filename>/etc/X11/app-defaults/URxvt</filename> file.
-    The following example provides a way to load the
-    <classname>matcher</classname><application>Perl</application> extension
-    (assuming <application>Perl</application> support wasn't disabled), which
-    enables a middle button click to open an underline URL in the specified
-    browser. It also sets a background and a foreground color and loads an Xft
-    font. Accomplish this by adding the following definitions as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/X11/app-defaults/URxvt &lt;&lt; "EOF"
-URxvt*perl-ext: matcher
+    <classname>urxvt</classname>. You can add X resource definitions to a
+    user's <filename>~/.Xresources</filename> file or to the system-wide
+    <filename>/etc/X11/app-defaults/URxvt</filename> file. The following
+    example will load the <classname>matcher</classname>
+    <application>Perl</application> extension (assuming
+    <application>Perl</application> support wasn't disabled), which enables a
+    middle button click to open an underlined URL in the specified browser,
+    sets a background and foreground color and loads an Xft font:</para>
+
+<screen><userinput>cat &gt;&gt; /etc/X11/app-defaults/URxvt &lt;&lt; "EOF"
+<literal>URxvt*perl-ext: matcher
 URxvt*urlLauncher: firefox
 URxvt.background: black
 URxvt.foreground: yellow
-URxvt*font: xft:Monospace:pixelsize=12
+URxvt*font: xft:Monospace:pixelsize=12</literal>
 EOF</userinput></screen>
 
@@ -136,20 +141,14 @@
     within the same process. The <command>urxvtc</command> client then connects
     to the <command>urxvtd</command> daemon and requests a new terminal window.
-    </para>
-
-  <note>
-    <para>Use that option with caution. If the daemon crashes, all the
-    running processes in the terminal windows are terminated.</para>
-  </note>
-
-    <para>
-    You can start the <command>urxvtd</command> daemon in the system or
-    personal startup <command>X</command> session scripts (e.g.,
+    Use this option with caution. If the daemon crashes, all the running
+    processes in the terminal windows are terminated.</para>
+
+    <para>You can start the <command>urxvtd</command> daemon in the system or
+    personal startup <command>X</command> session script (e.g.,
     <filename>~/.xinitrc</filename>) by adding the following lines near the top
     of the script:</para>
 
 <screen><userinput><literal># Start the urxvtd daemon
-urxvtd -q -f -o &amp;
-</literal></userinput></screen>
+urxvtd -q -f -o &amp;</literal></userinput></screen>
 
     <para>For more information, examine the <command>urxvt</command>,
@@ -168,5 +167,5 @@
 
       <seglistitem>
-        <seg>urxvt, urxvtd, and urxvtc.</seg>
+        <seg>urxvt, urxvtd, and urxvtc</seg>
         <seg>Many <application>Perl</application> extensions located under
         <filename class='directory'>/usr/lib/urxvt/perl</filename></seg>
@@ -193,5 +192,5 @@
         <term><command>urxvtd</command></term>
         <listitem>
-          <para>is the urxvt terminal daemon.</para>
+          <para>is the <command>urxvt</command> terminal daemon.</para>
           <indexterm zone="rxvt-unicode urxvtd">
             <primary sortas="b-urxvtd">urxvtd</primary>
@@ -203,5 +202,5 @@
         <term><command>urxvtc</command></term>
         <listitem>
-          <para>controls the urxvtd daemon.</para>
+          <para>controls the <command>urxvtd</command> daemon.</para>
           <indexterm zone="rxvt-unicode urxvtc">
             <primary sortas="b-urxvtc">xterm</primary>
