diff --git a/etc/fbtab b/etc/fbtab
deleted file mode 100644
index 06d2d6127..000000000
--- a/etc/fbtab
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD: src/etc/fbtab,v 1.3 1999/09/13 17:09:07 peter Exp $
-#
-#/dev/ttyv0	0600	/dev/console
-#/dev/ttyv0	0600	/dev/pcaudio:/dev/pcaudioctl
diff --git a/etc/ddb.conf b/usr/local/etc/ddb.conf
similarity index 100%
rename from etc/ddb.conf
rename to usr/local/etc/ddb.conf
diff --git a/usr/local/etc/rc b/usr/local/etc/rc
index 7b8c9d7b8..cc9db08cd 100755
--- a/usr/local/etc/rc
+++ b/usr/local/etc/rc
@@ -25,7 +25,7 @@ version=`/bin/cat /usr/local/etc/version`
 # Setup dumpdev/ddb/savecore"
 echo "Configuring crash dumps..."
 if [ "$PLATFORM" = "pfSense" ]; then
-	/etc/rc.dumpon
+	/usr/local/etc/rc.dumpon
 fi
 
 if [ -e /root/force_fsck ]; then
@@ -183,8 +183,8 @@ elif [ "$PLATFORM" = "jail" ]; then
 	# do nothing for jail platform
 else
 	SWAPDEVICE=`/bin/cat /etc/fstab | /usr/bin/grep swap | /usr/bin/cut -f1`
-	/sbin/swapon -a 2>/dev/null >/dev/null
-	/etc/rc.savecore
+	/sbin/swapon -a
+	/usr/local/etc/rc.savecore
 
 	if [ -d /root/var/db/pkg ]; then
 		# User must have just disabled RAM disks, move these back into place.
diff --git a/etc/rc.dumpon b/usr/local/etc/rc.dumpon
similarity index 84%
rename from etc/rc.dumpon
rename to usr/local/etc/rc.dumpon
index fad1a8249..1f28ee995 100755
--- a/etc/rc.dumpon
+++ b/usr/local/etc/rc.dumpon
@@ -1,8 +1,4 @@
 #!/bin/sh
-# Based on:
-# FreeBSD: src/etc/rc.d/dumpon,v 1.12.2.1.4.1 2010/06/14 02:09:06 kensmith Exp
-
-# dumpon
 
 dumpon_try()
 {
@@ -24,6 +20,7 @@ while read dev mp type more ; do
 	[ -c "${dev}" ] || continue
 	dumpon_try "${dev}" && works=true
 done </etc/fstab
+
 if [ "${works}" != "true" ]; then
 	echo "No suitable dump device was found." 1>&2
 	exit
@@ -31,5 +28,5 @@ fi
 
 # ddb
 if [ ! -z "`sysctl -Nq debug.ddb.scripting.scripts`" ]; then
-	/sbin/ddb /etc/ddb.conf
+	/sbin/ddb /usr/local/etc/ddb.conf
 fi
diff --git a/etc/rc.savecore b/usr/local/etc/rc.savecore
similarity index 100%
rename from etc/rc.savecore
rename to usr/local/etc/rc.savecore