diff --git a/unix/xserver16.patch b/unix/xserver16.patch
index e34c321..ea84bf5 100644
--- a/unix/xserver16.patch
+++ b/unix/xserver16.patch
@@ -1,6 +1,6 @@
 diff -up xserver/configure.ac.vnc xserver/configure.ac
---- xserver/configure.ac.vnc	2011-04-29 12:18:07.151996669 +0200
-+++ xserver/configure.ac	2011-04-29 12:18:30.900810648 +0200
+--- xserver/configure.ac.vnc	2011-05-11 11:06:29.966753119 +0200
++++ xserver/configure.ac	2011-05-11 11:06:37.286488408 +0200
 @@ -29,7 +29,6 @@ AC_PREREQ(2.57)
  AC_INIT([xorg-server], 1.6.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
  AC_CONFIG_SRCDIR([Makefile.am])
@@ -66,8 +66,8 @@
  hw/xwin/Makefile
  hw/xquartz/Makefile
 diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
---- xserver/hw/Makefile.am.vnc	2011-04-29 12:18:08.533275421 +0200
-+++ xserver/hw/Makefile.am	2011-04-29 12:18:30.900810648 +0200
+--- xserver/hw/Makefile.am.vnc	2011-05-11 11:06:30.022751094 +0200
++++ xserver/hw/Makefile.am	2011-05-11 11:06:37.286488408 +0200
 @@ -33,7 +33,8 @@ SUBDIRS =			\
  	$(XNEST_SUBDIRS)	\
  	$(DMX_SUBDIRS)		\
@@ -79,21 +79,25 @@
  DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
  
 diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
---- xserver/mi/miinitext.c.vnc	2011-04-29 12:18:11.004774157 +0200
-+++ xserver/mi/miinitext.c	2011-04-29 12:18:30.905811656 +0200
-@@ -272,6 +272,7 @@ extern void DamageExtensionInit(INITARGS
+--- xserver/mi/miinitext.c.vnc	2011-05-11 11:06:30.127747296 +0200
++++ xserver/mi/miinitext.c	2011-05-11 11:07:10.182298769 +0200
+@@ -272,6 +272,9 @@ extern void DamageExtensionInit(INITARGS
  extern void CompositeExtensionInit(INITARGS);
  #endif
  extern void GEExtensionInit(INITARGS);
++#ifdef TIGERVNC
 +extern void vncExtensionInit(INITARGS);
++#endif
  
  /* The following is only a small first step towards run-time
   * configurable extensions.
-@@ -438,6 +439,7 @@ InitExtensions(int argc, char *argv[])
+@@ -438,6 +441,9 @@ InitExtensions(int argc, char *argv[])
  #ifdef XF86BIGFONT
      if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
  #endif
++#ifdef TIGERVNC
 +    vncExtensionInit();
++#endif
  #if !defined(NO_HW_ONLY_EXTS)
  #if defined(XF86VIDMODE)
      if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();