diff --git a/pkg/+POST_INSTALL b/pkg/+POST_INSTALL
index 3076c1514..89f1449a3 100644
--- a/pkg/+POST_INSTALL
+++ b/pkg/+POST_INSTALL
@@ -12,10 +12,11 @@ sed -i "" -e "s/^  enabled: yes$/  enabled: no/" /etc/pkg/FreeBSD.conf
 
 echo "Hooking into /etc/rc"
 cp /etc/rc /etc/rc.bak
-cat > /etc/rc <<EOG
+cat > /etc/rc <<EOF
 #!/bin/sh
 # OPNsense rc(8) hook was automatically installed:
+if [ -d /root/core ]; then /usr/bin/make -C /root/core mount; fi
 if [ -f /usr/local/etc/rc ]; then /usr/local/etc/rc; exit 0; fi
-EOG
+EOF
 cat /etc/rc.bak >> /etc/rc
 rm -f /etc/rc.bak
diff --git a/pkg/+PRE_DEINSTALL b/pkg/+PRE_DEINSTALL
index 34c70d1e1..0f3a5b276 100644
--- a/pkg/+PRE_DEINSTALL
+++ b/pkg/+PRE_DEINSTALL
@@ -9,7 +9,7 @@ rm -f /etc/shells.bak
 echo "Unhooking from /etc/rc"
 cp /etc/rc /etc/rc.bak
 LINES=\$(cat /etc/rc | wc -l)
-tail -n \$(expr \${LINES} - 3) /etc/rc.bak > /etc/rc
+tail -n \$(expr \${LINES} - 4) /etc/rc.bak > /etc/rc
 rm -f /etc/rc.bak
 
 echo "Enabling FreeBSD mirror"
diff --git a/src/etc/rc b/src/etc/rc
index 2b3d987c7..6d547663a 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -99,11 +99,6 @@ else
 		fi
 	fi
 
-	# mount repo if available
-	if [ -d /root/core ]; then
-		/usr/bin/make -C /root/core mount
-	fi
-
 	# Check to see if a compact flash mountpoint exists
 	# If it fails to mount then run a fsck -y
 	if grep -q cf /etc/fstab; then