diff --git a/package/base/lvm-wrapper/config.in b/package/base/lvm-wrapper/config.in
index dd45f444a..dc25c47cb 100644
--- a/package/base/lvm-wrapper/config.in
+++ b/package/base/lvm-wrapper/config.in
@@ -22,6 +22,7 @@
 
 if pkgcheck lvm X || pkgcheck lvm2 X
 then
+  menu_begin MENU_COMPILER 'LVM / LVM2 Related Options'
 	# if ! pkgcheck lvm-wrapper X ; then
 	# 	comment "WARNING! You should really select the lvm-wrapper package when using lvm or lvm2."
 	# fi
@@ -31,4 +32,5 @@ then
 		"none" "Dont install any man-pages regarding LVM" \
 		"lvm"  "Install util man-pages for native LVM of linux-2.4" \
 		"lvm2" "Install util man-pages for LVM2 based on device-mapper"
+  menu_end
 fi
diff --git a/package/x11/xorg/config.in b/package/x11/xorg/config.in
index a58fea572..62490deed 100644
--- a/package/x11/xorg/config.in
+++ b/package/x11/xorg/config.in
@@ -20,33 +20,31 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-if pkgcheck xfree86 X && pkgcheck xorg X
+if pkgcheck xfree86 X || pkgcheck xorg X
 then
-  menu_begin MENU_PKG_XORG 'X.Org 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
-
-	bool 'Build X.Org instead of Xfree86' \
-		ROCKCFG_PKG_XORG_BUILD 1
-
-	if [ $ROCKCFG_PKG_XORG_BUILD = 1 ] ; then
-		bool 'Enable Xinerama support globally' \
-			ROCKCFG_PKG_XFREE86_XINERAMA 1
-
-		# Enable X.Org packages and disable xfree86 ones				
-		pkgremove xfree86
+  menu_begin MENU_PKG_XORG 'X.Org / XFree86 Options'
+
+	if pkgcheck xfree86 X && pkgcheck xorg X
+	then
+		bool 'Build X.Org (instead of Xfree86)' \
+			ROCKCFG_PKG_XORG_BUILD 1
+
+		if [ $ROCKCFG_PKG_XORG_BUILD = 1 ] ; then
+			pkgremove xfree86
+		else
+			pkgremove xorg
+		fi
 	else
-		pkgremove xorg
+		if pkgcheck xfree86 X; then
+			comment 'Using XFree86 (xorg already disabled)'
+		fi
+		if pkgcheck xorg X; then
+			comment 'Using X.Org (xfree86 already disabled)'
+		fi
 	fi
 
+	bool 'Enable Xinerama support globally' \
+		ROCKCFG_PKG_XORG_XINERAMA 1
   menu_end
 fi
 
diff --git a/package/x11/xorg/parse-config b/package/x11/xorg/parse-config
index 34f8e2417..dd1c36faa 100644
--- a/package/x11/xorg/parse-config
+++ b/package/x11/xorg/parse-config
@@ -20,7 +20,7 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-if [ "$ROCKCFG_PKG_XFREE86_XINERAMA" = 1 ] ; then
+if [ "$ROCKCFG_PKG_XORG_XINERAMA" = 1 ] ; then
 	var_append confopt " " "--with-xinerama"
 fi