diff -Naur vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/configure.ac
--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/configure.ac	2009-04-14 19:15:16.000000000 +0200
+++ vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/configure.ac	2009-05-19 18:34:36.000000000 +0200
@@ -29,7 +29,6 @@
 AC_INIT([xorg-server], 1.6.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
-AM_MAINTAINER_MODE
 
 RELEASE_DATE="2009-4-14"
 
@@ -1199,6 +1198,9 @@
 	AC_SUBST([XVFB_SYS_LIBS])
 fi
 
+dnl Xvnc DDX
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC"])
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"])
 
 dnl Xnest DDX
 
@@ -1875,6 +1877,7 @@
 hw/dmx/glxProxy/Makefile
 hw/dmx/Makefile
 hw/vfb/Makefile
+hw/vnc/Makefile
 hw/xnest/Makefile
 hw/xwin/Makefile
 hw/xquartz/Makefile
diff -Naur vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/hw/Makefile.am
--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am	2008-12-16 23:43:11.000000000 +0100
+++ vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/hw/Makefile.am	2009-05-19 18:32:59.000000000 +0200
@@ -33,7 +33,8 @@
 	$(XNEST_SUBDIRS)	\
 	$(DMX_SUBDIRS)		\
 	$(KDRIVE_SUBDIRS)	\
-	$(XQUARTZ_SUBDIRS)
+	$(XQUARTZ_SUBDIRS)	\
+	vnc
 
 DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
 
diff -Naur vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/mi/miinitext.c
--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c	2009-04-14 19:14:57.000000000 +0200
+++ vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/mi/miinitext.c	2009-05-19 18:32:00.000000000 +0200
@@ -205,6 +205,7 @@
 extern void XTestExtensionInit(INITARGS);
 #endif
 extern void BigReqExtensionInit(INITARGS);
+extern void vncExtensionInit(INITARGS);
 #ifdef SCREENSAVER
 extern void ScreenSaverExtensionInit (INITARGS);
 #endif
@@ -406,6 +407,7 @@
     if (!noTestExtensions) XTestExtensionInit();
 #endif
     BigReqExtensionInit();
+    vncExtensionInit();
 #if defined(SCREENSAVER)
     if (!noScreenSaverExtension) ScreenSaverExtensionInit ();
 #endif