diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index a018c6096..121bac9ec 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -5,6 +5,7 @@
                    build style
  - Dennis Wecker: sylpheed
  - Piotr Esden-Tempski: curl dietlibc fix V2
+ - added xinerama option to xfree86
 
 *) 2003-09-07 (2.0.0-rc1 - 2.0.0-rc2)
 
diff --git a/package/x11/xfree86-cvs/config.hlp b/package/x11/xfree86/config.hlp
similarity index 81%
rename from package/x11/xfree86-cvs/config.hlp
rename to package/x11/xfree86/config.hlp
index 09fb4ea3c..6fc76a0d0 100644
--- a/package/x11/xfree86-cvs/config.hlp
+++ b/package/x11/xfree86/config.hlp
@@ -24,5 +24,10 @@ MENU_PKG_XFREE86
   Here you'll find options for XFree86.
 
 ROCKCFG_PKG_XFREE86_CVS
-  Please check here if you want to use a current CVS-Snapshot instead
-  of a release.
+  This options enables the build a current CVS-Snapshot instead
+  of a release/snapshot package.
+
+ROCKCFG_PKG_XFREE86_XINERAMA
+  This options enables support for Xinerama globally - so many packages
+  are build with special multi-head support.
+
diff --git a/package/x11/xfree86-cvs/config.in b/package/x11/xfree86/config.in
similarity index 86%
rename from package/x11/xfree86-cvs/config.in
rename to package/x11/xfree86/config.in
index 665e8210a..12b463a1e 100644
--- a/package/x11/xfree86-cvs/config.in
+++ b/package/x11/xfree86/config.in
@@ -20,16 +20,20 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-if pkgcheck xfree86 X ; then
-    menu_begin MENU_PKG_XFREE86 'XFree86 Options'
+menu_begin MENU_PKG_XFREE86 'XFree86 Options'
 	bool 'Use a CVS checkout instead of last stable release' \
 		ROCKCFG_PKG_XFREE86_CVS 0
 
 	if [ "$ROCKCFG_PKG_XFREE86_CVS" = 1 ] ; then
+		pkgenable xfree86-cvs
 		pkgremove xfree86
 	else
+		pkgenable xfree86
 		pkgremove xfree86-cvs
 	fi
-    menu_end
-fi
+
+	bool 'Enable Xinerama support globally' \
+		ROCKCFG_PKG_XFREE86_XINERAMA 1
+
+menu_end