20 files changed, 10 insertions, 26 deletions
diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in
index d85d92479..38c32825f 100644
--- a/rules/graphics_and_multimedia.in
+++ b/rules/graphics_and_multimedia.in
@@ -76,10 +76,3 @@ if XORG
 source "generated/multimedia_xorg.in"
 endif
 
-menu "xorg applications             "
-source "generated/x_apps.in"
-endmenu
-
-menu "xorg window managers          "
-source "generated/x_windowmanagers.in"
-endmenu
diff --git a/rules/hpanel.in b/rules/hpanel.in
index 206ee916c..cffc82acd 100644
--- a/rules/hpanel.in
+++ b/rules/hpanel.in
@@ -1,4 +1,4 @@
-## SECTION=x_apps
+## SECTION=multimedia_xorg_app
 
 config HPANEL
 	tristate
diff --git a/rules/xli.in b/rules/xli.in
index 512e64932..4bfe11c60 100644
--- a/rules/xli.in
+++ b/rules/xli.in
@@ -1,4 +1,4 @@
-## SECTION=x_apps
+## SECTION=multimedia_xorg_app
 
 config XLI
 	tristate
diff --git a/rules/xorg-app-mkfontdir.in b/rules/xorg-app-mkfontdir.in
index 619a8b91e..24867d9a7 100644
--- a/rules/xorg-app-mkfontdir.in
+++ b/rules/xorg-app-mkfontdir.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_MKFONTDIR
 	tristate
-	depends on XORG_APP
 	select XORG_APP_MKFONTSCALE
 	prompt "xorg mkfontdir"
 	help
diff --git a/rules/xorg-app-mkfontscale.in b/rules/xorg-app-mkfontscale.in
index 431351205..8050a3b2d 100644
--- a/rules/xorg-app-mkfontscale.in
+++ b/rules/xorg-app-mkfontscale.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_MKFONTSCALE
 	tristate
-	depends on XORG_APP
 	select XORG_LIB_FONTENC
 	select FREETYPE
 	prompt "xorg mkfontscale"
diff --git a/rules/xorg-app-rgb.in b/rules/xorg-app-rgb.in
index 364cb7344..6668f07cf 100644
--- a/rules/xorg-app-rgb.in
+++ b/rules/xorg-app-rgb.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_RGB
 	tristate
-	depends on XORG_APP
 	select XORG_LIB_X11
 	prompt "xorg rgb"
 	help
diff --git a/rules/xorg-app-setxkbmap.in b/rules/xorg-app-setxkbmap.in
index 5babd5c75..068b62428 100644
--- a/rules/xorg-app-setxkbmap.in
+++ b/rules/xorg-app-setxkbmap.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_SETXKBMAP
 	tristate
-	depends on XORG_APP
 	depends on XORG_KEYBOARD_MAPPING_SUPPORT
 	prompt "xorg setxkbmap"
 	select XORG_APP_XKBCOMP
diff --git a/rules/xorg-app-xauth.in b/rules/xorg-app-xauth.in
index 0bdd52b33..76014102f 100644
--- a/rules/xorg-app-xauth.in
+++ b/rules/xorg-app-xauth.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_XAUTH
 	tristate
-	depends on XORG_APP
 	select XORG_LIB_XAU
 	select XORG_LIB_XEXT
 	select XORG_LIB_XMU
diff --git a/rules/xorg-app-xdm.in b/rules/xorg-app-xdm.in
index 5079e6060..0fd027f1c 100644
--- a/rules/xorg-app-xdm.in
+++ b/rules/xorg-app-xdm.in
@@ -2,7 +2,6 @@
 
 menuconfig XORG_APP_XDM
 	tristate
-	depends on XORG_APP
 	prompt "xorg XDM"
 	select XORG_LIB_XPM
 	select XORG_LIB_XMU
diff --git a/rules/xorg-app-xeyes.in b/rules/xorg-app-xeyes.in
index 9a20a1772..757a9edfc 100644
--- a/rules/xorg-app-xeyes.in
+++ b/rules/xorg-app-xeyes.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_XEYES
 	tristate
-	depends on XORG_APP
 	select XORG_LIB_XMU
 	select XORG_LIB_XT
 	select XORG_LIB_SM
diff --git a/rules/xorg-app-xhost.in b/rules/xorg-app-xhost.in
index 2b9b8ce54..88bd73aab 100644
--- a/rules/xorg-app-xhost.in
+++ b/rules/xorg-app-xhost.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_XHOST
 	tristate
-	depends on XORG_APP
 	select XORG_LIB_X11
 	select XORG_LIB_XAU
 	select XORG_LIB_XMU
diff --git a/rules/xorg-app-xinit.in b/rules/xorg-app-xinit.in
index c39aa7377..7225ef901 100644
--- a/rules/xorg-app-xinit.in
+++ b/rules/xorg-app-xinit.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_XINIT
 	tristate
-	depends on XORG_APP
 	select XORG_LIB_X11
 	prompt "xorg xinit"
 	help
diff --git a/rules/xorg-app-xkbcomp.in b/rules/xorg-app-xkbcomp.in
index 278eab948..95ae1b263 100644
--- a/rules/xorg-app-xkbcomp.in
+++ b/rules/xorg-app-xkbcomp.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_XKBCOMP
 	tristate
-	depends on XORG_APP
 	depends on XORG_KEYBOARD_MAPPING_SUPPORT
 	prompt "xorg xkbcomp"
 	select XKEYBOARD_CONFIG
diff --git a/rules/xorg-app-xrdb.in b/rules/xorg-app-xrdb.in
index 32e2e5510..fc81db320 100644
--- a/rules/xorg-app-xrdb.in
+++ b/rules/xorg-app-xrdb.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_XRDB
         tristate
-	depends on XORG_APP
 	select XORG_LIB_XMU
 	select XORG_LIB_XT
 	select XORG_LIB_SM
diff --git a/rules/xorg-app-xset.in b/rules/xorg-app-xset.in
index b96e37566..07b757441 100644
--- a/rules/xorg-app-xset.in
+++ b/rules/xorg-app-xset.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_XSET
 	tristate
-	depends on XORG_APP
 	select XORG_LIB_XMU
 	select XORG_LIB_XT
 	select XORG_LIB_SM
diff --git a/rules/xorg-app-xsetroot.in b/rules/xorg-app-xsetroot.in
index ef01662a0..d531709f1 100644
--- a/rules/xorg-app-xsetroot.in
+++ b/rules/xorg-app-xsetroot.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_XSETROOT
 	tristate
-	depends on XORG_APP
 	select XORG_LIB_XMU
 	select XORG_LIB_X11
 	select XORG_LIB_XAU
diff --git a/rules/xorg-app-xvinfo.in b/rules/xorg-app-xvinfo.in
index 61bd2cc7a..512e137d5 100644
--- a/rules/xorg-app-xvinfo.in
+++ b/rules/xorg-app-xvinfo.in
@@ -2,7 +2,6 @@
 
 config XORG_APP_XVINFO
 	tristate
-	depends on XORG_APP
 	select XORG_LIB_X11
 	select XORG_LIB_XV
 	select XORG_LIB_XMU
diff --git a/rules/xorg-app.in b/rules/xorg-app.in
index 34832c779..530dfe612 100644
--- a/rules/xorg-app.in
+++ b/rules/xorg-app.in
@@ -2,8 +2,8 @@
 
 # xorg application configuration
 
-menuconfig XORG_APP
-        bool "xorg applications             "
+menu "xorg applications             "
 
 source "generated/multimedia_xorg_app.in"
 
+endmenu
diff --git a/rules/xorg_windowmanagers.in b/rules/xorg_windowmanagers.in
new file mode 100644
index 000000000..9dd052c8f
--- /dev/null
+++ b/rules/xorg_windowmanagers.in
@@ -0,0 +1,5 @@
+## SECTION=multimedia_xorg
+
+menu "xorg window managers          "
+source "generated/x_windowmanagers.in"
+endmenu
diff --git a/rules/xterm.in b/rules/xterm.in
index f8f1e9e7c..3f19f4d26 100644
--- a/rules/xterm.in
+++ b/rules/xterm.in
@@ -1,4 +1,4 @@
-## SECTION=x_apps
+## SECTION=multimedia_xorg_app
 
 config XTERM
 	tristate