diff --git a/pkgsel.d/mixed.all b/pkgsel.d/mixed.all
index 2933e15..88106ca 100644
--- a/pkgsel.d/mixed.all
+++ b/pkgsel.d/mixed.all
@@ -107,77 +107,6 @@ X popt
 X stone
 X mkinitrd
 
-###################### Begin XOrg basic packages and deps##################################
-# needed by xsm:
-X netkit-rsh
-
-# the basic modular X.org tree
-
-X xorg/*proto*
-X xorg/*ext
-X xorg/*lib*
-X xorg/*xf86-*
-
-# Disable clashing drivers
-O xorg/xf86-video-i810
-
-X xorg/font-*
-X fslsfonts
-X fstobdf
-X bdftopcf
-X rgb
-X xbitmaps
-X xorg-server
-X xinit
-X xrdb
-X xauth
-X iceauth
-X fontconfig
-X mkfontdir
-X mkfontscale
-X xcursorgen
-X xcursor-themes
-X xtrans
-X xau
-X xcmiscproto
-X xkbcomp
-X xkbdata
-X setxkbmap
-X mesa
-X makedepend
-X mesa-demos
-X cairo
-X rman
-X imake
-X xorg-cf-files
-X gccmakedep
-
-X xhost
-x xkill
-X xdpyinfo
-X xwininfo
-X xrandr
-X xmag
-X xorg/xset*
-X xev
-X xprop
-
-X freetype
-X gle
-X freeglut
-X lesstif
-X libgd
-X netpbm
-X xaw3d
-
-# a window manager and terminal
-X twm
-X xterm
-
-# needed by libx11
-X check
-
-###################### End XOrg basic packages and deps##################################
 ###################### Begin desktop basic packages and deps#############################
 
 X pcre
diff --git a/pkgsel.d/xorg.all b/pkgsel.d/xorg.all
new file mode 100644
index 0000000..f4d429d
--- /dev/null
+++ b/pkgsel.d/xorg.all
@@ -0,0 +1,68 @@
+# needed by xsm:
+X netkit-rsh
+
+# the basic modular X.org tree
+
+X xorg/*proto*
+X xorg/*ext
+X xorg/*lib*
+X xorg/*xf86-*
+
+# Disable clashing drivers
+O xorg/xf86-video-i810
+
+X xorg/font-*
+X fslsfonts
+X fstobdf
+X bdftopcf
+X rgb
+X xbitmaps
+X xorg-server
+X xinit
+X xrdb
+X xauth
+X iceauth
+X fontconfig
+X mkfontdir
+X mkfontscale
+X xcursorgen
+X xcursor-themes
+X xtrans
+X xau
+X xcmiscproto
+X xkbcomp
+X xkbdata
+X setxkbmap
+X mesa
+X makedepend
+X mesa-demos
+X cairo
+X rman
+X imake
+X xorg-cf-files
+X gccmakedep
+
+X xhost
+x xkill
+X xdpyinfo
+X xwininfo
+X xrandr
+X xmag
+X xorg/xset*
+X xev
+X xprop
+
+X freetype
+X gle
+X freeglut
+X lesstif
+X libgd
+X netpbm
+X xaw3d
+# a window manager and terminal
+X twm
+X xterm
+
+# needed by libx11
+X check
+