diff --git a/etc/etc.amd64/ttys b/etc/etc.amd64/ttys
index fe6a7b1c9bed..976cb7b164b1 100644
--- a/etc/etc.amd64/ttys
+++ b/etc/etc.amd64/ttys
@@ -41,7 +41,7 @@ ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv8	"/usr/X11R6/bin/xdm -nodaemon"	xterm	off secure
+ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 ttyd0	"/usr/libexec/getty std.9600"	dialup	off secure
diff --git a/etc/etc.arm/ttys b/etc/etc.arm/ttys
index a1af405acf2c..dc3a47c7333d 100644
--- a/etc/etc.arm/ttys
+++ b/etc/etc.arm/ttys
@@ -41,7 +41,7 @@ ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv8	"/usr/X11R6/bin/xdm -nodaemon"	xterm	off secure
+#ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 ttyu0	"/usr/libexec/getty std.9600"	vt100	on  secure
diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys
index fe6a7b1c9bed..976cb7b164b1 100644
--- a/etc/etc.i386/ttys
+++ b/etc/etc.i386/ttys
@@ -41,7 +41,7 @@ ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv8	"/usr/X11R6/bin/xdm -nodaemon"	xterm	off secure
+ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 ttyd0	"/usr/libexec/getty std.9600"	dialup	off secure
diff --git a/etc/etc.ia64/ttys b/etc/etc.ia64/ttys
index 3eede3b4143e..f7ac07ef311d 100644
--- a/etc/etc.ia64/ttys
+++ b/etc/etc.ia64/ttys
@@ -41,7 +41,7 @@ ttyv4	"/usr/libexec/getty Pc"		cons25	off secure
 ttyv5	"/usr/libexec/getty Pc"		cons25	off secure
 ttyv6	"/usr/libexec/getty Pc"		cons25	off secure
 ttyv7	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv8	"/usr/X11R6/bin/xdm -nodaemon"	xterm	off secure
+ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals. The 'dialup' keyword identifies dialin lines to login,
 # fingerd etc.
 ttyu0	"/usr/libexec/getty std.9600"	vt100	on  secure
diff --git a/etc/etc.powerpc/ttys b/etc/etc.powerpc/ttys
index 6535e64b5736..d0b9fe7a6826 100644
--- a/etc/etc.powerpc/ttys
+++ b/etc/etc.powerpc/ttys
@@ -41,7 +41,7 @@ ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv8	"/usr/X11R6/bin/xdm -nodaemon"	xterm	off secure
+#ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 ttyu0	"/usr/libexec/getty std.9600"	vt100	on  secure
diff --git a/etc/etc.sparc64/ttys b/etc/etc.sparc64/ttys
index b974db7b90a7..18aa4f9b1c8f 100644
--- a/etc/etc.sparc64/ttys
+++ b/etc/etc.sparc64/ttys
@@ -45,7 +45,7 @@ ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
 ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv8	"/usr/X11R6/bin/xdm -nodaemon"	xterm	off secure
+ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 # uart(4)
diff --git a/etc/login.conf b/etc/login.conf
index 75cecc82a046..9e8d02cd1a49 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -27,7 +27,7 @@ default:\
 	:copyright=/etc/COPYRIGHT:\
 	:welcome=/etc/motd:\
 	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,FTP_PASSIVE_MODE=YES:\
-	:path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/X11R6/bin ~/bin:\
+	:path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin ~/bin:\
 	:nologin=/var/run/nologin:\
 	:cputime=unlimited:\
 	:datasize=unlimited:\
@@ -141,7 +141,7 @@ russian|Russian Users Accounts:\
 ## users of X (needs more resources!)
 ##
 #xuser:\
-#	:manpath=/usr/share/man /usr/X11R6/man /usr/local/man:\
+#	:manpath=/usr/share/man /usr/local/man:\
 #	:cputime=4h:\
 #	:datasize=12M:\
 #	:vmemoryuse=infinity:\
diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
index 313af8e2507d..36df9c61f71d 100644
--- a/etc/root/dot.cshrc
+++ b/etc/root/dot.cshrc
@@ -14,7 +14,7 @@ alias ll	ls -lA
 # A righteous umask
 umask 22
 
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/X11R6/bin $HOME/bin)
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin)
 
 setenv	EDITOR	vi
 setenv	PAGER	more