diff --git a/etc/shells b/etc/shells
deleted file mode 100644
index 3ccb4dc21..000000000
--- a/etc/shells
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD: src/etc/shells,v 1.5 2000/04/27 21:58:46 ache Exp $
-#
-# List of acceptable shells for chpass(1).
-# Ftpd will not allow users to connect who are not using
-# one of these shells.
-
-/bin/sh
-/bin/csh
-/bin/tcsh
-/etc/rc.initial
-/usr/local/sbin/ssh_tunnel_shell
-
diff --git a/root/.profile b/root/.profile
deleted file mode 100644
index 44a75d510..000000000
--- a/root/.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-# Detect interactive logins and display the shell
-/etc/rc.initial
-exit
diff --git a/root/.shrc b/root/.shrc
deleted file mode 100644
index 44a75d510..000000000
--- a/root/.shrc
+++ /dev/null
@@ -1,3 +0,0 @@
-# Detect interactive logins and display the shell
-/etc/rc.initial
-exit
diff --git a/root/.tcshrc b/root/.tcshrc
deleted file mode 100644
index ae2e4509a..000000000
--- a/root/.tcshrc
+++ /dev/null
@@ -1,20 +0,0 @@
-set autologout="0"
-set autolist set color set colorcat
-setenv CLICOLOR "true"
-setenv LSCOLORS "exfxcxdxbxegedabagacad"
-if ($term == "xterm" || $term == "vt100" || $term == "vt102" || $term == "vt220" || $term !~ "con*") then
-	bindkey "\e[2~" overwrite-mode     # Ins
-	bindkey "\e[3~" delete-char        # Del
-
-	bindkey "\e[1~" beginning-of-line  # Home vt
-	bindkey "\e[4~" end-of-line        # End vt
-
-	bindkey "\eOH" beginning-of-line   # Home vt220
-	bindkey "\eOF" end-of-line         # End vt220
-
-	bindkey "\e[H" beginning-of-line   # Home kvt
-	bindkey "\e[F" end-of-line         # End kvt
-
-	bindkey "\e[7~" beginning-of-line  # Home rxvt/konsole
-	bindkey "\e[8~" end-of-line        # End rxvt/konsole
-endif
diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command
index 3f498f23a..2480823c8 100755
--- a/tmp/post_upgrade_command
+++ b/tmp/post_upgrade_command
@@ -9,7 +9,7 @@ if [ $PFSENSETYPE = "pfSense" ] || [ $PFSENSETYPE = "nanobsd" ]; then
 fi
 
 # Detect interactive logins and display the shell
-detect_command='[ -n "$SSH_TTY" -o "$TERM" = "cons25" ] && exec /etc/rc.initial'
+detect_command='[ -n "$SSH_TTY" -o "$TERM" = "cons25" ] && exec /usr/local/etc/rc.initial'
 echo "$detect_command" > $CVS_CO_DIR/root/.shrc
 echo "$detect_command" >> $CVS_CO_DIR/root/.profile
 
diff --git a/usr/local/etc/inc/auth.inc b/usr/local/etc/inc/auth.inc
index 65b701f14..50798c067 100644
--- a/usr/local/etc/inc/auth.inc
+++ b/usr/local/etc/inc/auth.inc
@@ -387,7 +387,7 @@ function local_user_set(& $user) {
 	$user_uid = $user['uid'];
 	$user_name = $user['name'];
 	$user_home = "{$home_base}{$user_name}";
-	$user_shell = "/etc/rc.initial";
+	$user_shell = "/usr/local/etc/rc.initial";
 	$user_group = "nobody";
 
 	// Ensure $home_base exists and is writable
@@ -426,7 +426,7 @@ function local_user_set(& $user) {
 		pclose($fd);
 		$user_group = "wheel";
 		$user_home = "/root";
-		$user_shell = "/etc/rc.initial";
+		$user_shell = "/usr/local/etc/rc.initial";
 	}
 
 	/* read from pw db */
diff --git a/etc/rc.initial b/usr/local/etc/rc.initial
similarity index 99%
rename from etc/rc.initial
rename to usr/local/etc/rc.initial
index c7c59cbce..cf1f3cf49 100755
--- a/etc/rc.initial
+++ b/usr/local/etc/rc.initial
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# /etc/rc.initial
 # part of pfSense by Scott Ullrich
 # Copyright (C) 2004-2011 Scott Ullrich, All rights reserved.
 # originally based on m0n0wall (http://neon1.net/m0n0wall)