diff --git a/x11-apps/xinit/files/xdm.confd-1 b/x11-apps/xinit/files/xdm.confd-1
deleted file mode 100644
index aa1219e..0000000
--- a/x11-apps/xinit/files/xdm.confd-1
+++ /dev/null
@@ -1,12 +0,0 @@
-# We always try and start X on a static VT. The various DMs normally default
-# to using VT7. If you wish to use the xdm init script, then you should ensure
-# that the VT checked is the same VT your DM wants to use. We do this check to
-# ensure that you have't accidently configured something to run on the VT
-# in your /etc/inittab file so that you don't get a dead keyboard.
-CHECKVT=7
-
-# What display manager do you use ?  [ xdm | gdm | kdm | kdm-3.5 | kdm-4.0 | gpe | entrance ]
-# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
-# KDE-specific note: kdm-3.5 and kdm-4.0 are just examples. You will find all 
-# possible versions by looking at the directories in /usr/kde/.
-DISPLAYMANAGER="xdm"
diff --git a/x11-apps/xinit/files/xdm.initd-3 b/x11-apps/xinit/files/xdm.initd-3
index 46beb32..4839da4 100755
--- a/x11-apps/xinit/files/xdm.initd-3
+++ b/x11-apps/xinit/files/xdm.initd-3
@@ -39,7 +39,7 @@
 
 # Start X Font Server before X
 depend() {
-	need localmount xdm-setup
+	need localmount
 
 	# this should start as early as possible
 	# we can't do 'before *' as that breaks it
@@ -126,12 +126,11 @@ vtstatic() {
 start() {
 	local EXE= NAME= PIDFILE=
 	setup_dm
-	
-	if [ -f /etc/init.d/.noxdm ] ; then
-		einfo "Skipping ${EXE}, /etc/init.d/.noxdm found"
-		rm /etc/init.d/.noxdm
-		return 1
-	fi
+
+        if get_bootparam "nox" ; then
+		einfo "Skipping ${EXE}, nox option was passed"
+		return 0
+        fi
 	
 	ebegin "Setting up ${EXE##*/}"
 	#save the prefered DM
diff --git a/x11-apps/xinit/xinit-1.0.8-r8.ebuild b/x11-apps/xinit/xinit-1.0.8-r8.ebuild
index 3200b93..83ae666 100644
--- a/x11-apps/xinit/xinit-1.0.8-r8.ebuild
+++ b/x11-apps/xinit/xinit-1.0.8-r8.ebuild
@@ -59,7 +59,6 @@ src_install() {
 	exeinto /etc/X11/xinit
 	doexe "${FILESDIR}"/xinitrc || die
 	newinitd "${FILESDIR}"/xdm.initd-3 xdm
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
 	newconfd "${FILESDIR}"/xdm.confd-1 xdm
 	newpamd "${FILESDIR}"/xserver.pamd xserver