Index: xsoft/other/tigervnc.xml
===================================================================
--- xsoft/other/tigervnc.xml	(revision 9d2268bb3cd921f1b382402745bc9be4cf59cae3)
+++ xsoft/other/tigervnc.xml	(revision b636cda32384c0e12715f7673977bed3495ca740)
@@ -7,9 +7,9 @@
   <!ENTITY tigervnc-download-http "&sources-anduin-http;/tigervnc/tigervnc-&tigervnc-version;.tar.gz">
   <!ENTITY tigervnc-download-ftp  " ">
-  <!ENTITY tigervnc-md5sum        "b11cc4c4d5249b9b8e355ee6f47ec4fe">
-  <!ENTITY tigervnc-size          "1.6 MB">
-  <!ENTITY tigervnc-buildsize     "167 MB">
+  <!ENTITY tigervnc-md5sum        "78b736445781d86c48e942465a391ccc">
+  <!ENTITY tigervnc-size          "1.3 MB">
+  <!ENTITY tigervnc-buildsize     "171 MB">
   <!ENTITY tigervnc-time          "1.6 SBU">
-  <!ENTITY tigervnc-xorg-version  "1.17.2">
+  <!ENTITY tigervnc-xorg-version  "1.18.0">
 ]>
 
@@ -67,4 +67,10 @@
           Required file:
           <ulink url="&xorg-download-http;/xserver/xorg-server-&tigervnc-xorg-version;.tar.bz2"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/tigervnc-&tigervnc-version;-xorg118-1.patch"/>
         </para>
       </listitem>
@@ -111,15 +117,25 @@
     commands:</para>
 
-<screen><userinput>tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 -C unix/xserver --strip-components=1 &amp;&amp;
-
-patch -Np1 -i ../tigervnc-&tigervnc-version;-gethomedir-1.patch &amp;&amp;
-sed -i 's/iconic/nowin/' unix/vncserver            &amp;&amp;
-
-cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr &amp;&amp;
+<screen><userinput>patch -Np1 -i ../tigervnc-&tigervnc-version;-xorg118-1.patch    &amp;&amp;
+patch -Np1 -i ../tigervnc-&tigervnc-version;-gethomedir-1.patch &amp;&amp;<!--
+sed -i 's/iconic/nowin/' unix/vncserver            &amp;&amp;-->
+
+mkdir -vp build &amp;&amp;
+cd        build &amp;&amp;
+
+# Build viewer
+cmake -G "Unix Makefiles"         \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -Wno-dev .. &amp;&amp;
 make &amp;&amp;
 
-pushd unix/xserver                  &amp;&amp;
-  patch -Np1 -i ../xserver116.patch &amp;&amp;
-  autoreconf -fiv                   &amp;&amp;
+# Build server
+cp -vR ../unix/xserver unix/ &amp;&amp;
+tar -xf ../xorg-server-&tigervnc-xorg-version;.tar.bz2 -C unix/xserver --strip-components=1         &amp;&amp;
+
+pushd unix/xserver &amp;&amp;
+  patch -Np1 -i ../../../unix/xserver117.patch &amp;&amp;
+  autoreconf -fi   &amp;&amp;
 
   ./configure $XORG_CONFIG \
@@ -131,6 +147,6 @@
       --disable-static      --enable-dri3                              \
       --without-dtrace      --enable-dri2        --enable-glx          \
-      --enable-glx-tls      --with-pic  &amp;&amp;
-  make    &amp;&amp;
+      --with-pic &amp;&amp;
+  make TIGERVNC_SRCDIR=`pwd`/../../../ &amp;&amp;
 popd</userinput></screen>
 
@@ -139,8 +155,11 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-
-cd unix/xserver/hw/vnc &amp;&amp;
-make install           &amp;&amp;
+<screen role="root"><userinput>#Install viewer
+make install &amp;&amp;
+
+#Install server
+pushd unix/xserver/hw/vnc &amp;&amp;
+  make install &amp;&amp;
+popd &amp;&amp;
 
 [ -e /usr/bin/Xvnc ] || ln -svf $XORG_PREFIX/bin/Xvnc /usr/bin/Xvnc</userinput></screen>
@@ -159,5 +178,8 @@
 StartupNotify=false
 Categories=Network;RemoteAccess;</literal>
-EOF</userinput></screen>
+EOF
+
+install -vm644 ../media/icons/tigervnc_24.png /usr/share/pixmaps &amp;&amp;
+ln -sfv tigervnc_24.png /usr/share/pixmaps/tigervnc.png</userinput></screen>
 
   </sect2>
@@ -166,9 +188,9 @@
     <title>Command Explanations</title>
 
+    <para><command>patch ...</command>: This set of patches modifies the standard
+    Xorg server so that the Xvnc command can be built.</para>
+
     <para><command>tar -xf .. xorg-server...</command>: This command extracts the
     standard Xorg packages into the tree in a location needed for modification.</para>
-
-    <para><command>patch ...</command>: This set of patches modifies the standard
-    Xorg server so that the Xvnc command can be built.</para>
 
     <para><option>--disable ...</option>: Most options that are usually needed for
@@ -218,5 +240,5 @@
 
         <seg>libvnc.so</seg>
-        <seg>None</seg>
+        <seg>/usr/share/doc/tigervnc-&tigervnc-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -284,5 +306,5 @@
         <term><command>x0vncserver</command></term>
         <listitem>
-          <para>is a program to make an X display onm a physical
+          <para>is a program to make an X display on a physical
           terminal accessible via TigerVNC or compatible viewers.</para>
           <indexterm zone="tigervnc x0vncserver">
