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-05-19 19:33:12.000000000 +0200
+++ vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/configure.ac	2009-05-19 19:40:08.000000000 +0200
@@ -1237,6 +1237,8 @@
 xorg_bus_bsdpci=no
 xorg_bus_sparc=no
 
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+
 if test "x$XORG" = xyes; then
 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
@@ -1424,7 +1426,6 @@
 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
 	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
diff -Naur vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/vnc/xf86vncModule.cc vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/hw/vnc/xf86vncModule.cc
--- vnc-4_1_3-unixsrc/unix/xorg-x11-server-source/hw/vnc/xf86vncModule.cc	2008-10-16 17:16:20.000000000 +0200
+++ vnc-4_1_3-unixsrc-magellan/unix/xorg-x11-server-source/hw/vnc/xf86vncModule.cc	2009-05-19 19:38:39.000000000 +0200
@@ -58,7 +58,7 @@
     "RealVNC Ltd",
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_EXTENSION,         /* needs the server extension ABI */
     ABI_EXTENSION_VERSION,