diff --git a/package/x11/xfree86/config.hlp b/package/x11/xfree86/config.hlp
deleted file mode 100644
index d51e86d10..000000000
--- a/package/x11/xfree86/config.hlp
+++ /dev/null
@@ -1,33 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x11/xfree86/config.hlp
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-MENU_PKG_XFREE86
-  Here you'll find options for XFree86.
-
-ROCKCFG_PKG_XFREE86_CVS
-  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/config.in b/package/x11/xfree86/config.in
deleted file mode 100644
index e06de5e5f..000000000
--- a/package/x11/xfree86/config.in
+++ /dev/null
@@ -1,44 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x11/xfree86/config.in
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-if pkgcheck xfree86 X || pkgcheck xorg X ; then
-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
-
-if [ "$ROCKCFG_PKG_XORG_BUILD" = "1" ] ; then
-	comment 'This menu is disabled. Please see X.Org menu.' 
-else	
-	bool 'Enable Xinerama support globally' \
-		ROCKCFG_PKG_XFREE86_XINERAMA 1
-fi
-menu_end
-fi
-
diff --git a/package/x11/xfree86/parse-config b/package/x11/xfree86/parse-config
deleted file mode 100644
index fb3379d6a..000000000
--- a/package/x11/xfree86/parse-config
+++ /dev/null
@@ -1,26 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x11/xfree86/parse-config
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-if [ "$ROCKCFG_PKG_XFREE86_XINERAMA" = 1 ] ; then
-	var_append confopt " " "--with-xinerama"
-fi
-
diff --git a/package/x11/xorg/config.in b/package/x11/xorg/config.in
index 313fd0a59..a58fea572 100644
--- a/package/x11/xorg/config.in
+++ b/package/x11/xorg/config.in
@@ -35,7 +35,7 @@ then
 #	fi
 
 	bool 'Build X.Org instead of Xfree86' \
-		ROCKCFG_PKG_XORG_BUILD 0
+		ROCKCFG_PKG_XORG_BUILD 1
 
 	if [ $ROCKCFG_PKG_XORG_BUILD = 1 ] ; then
 		bool 'Enable Xinerama support globally' \