diff --git a/+POST_INSTALL b/+POST_INSTALL
index 2db89b700..5941d14b7 100644
--- a/+POST_INSTALL
+++ b/+POST_INSTALL
@@ -3,6 +3,10 @@ cp /etc/shells /etc/shells.bak
 (grep -v /usr/local/etc/rc.initial /etc/shells.bak; \
     echo /usr/local/etc/rc.initial) > /etc/shells
 rm -f /etc/shells.bak
+cp /etc/shells /etc/shells.bak
+(grep -v /usr/local/etc/rc.installer /etc/shells.bak; \
+    echo /usr/local/etc/rc.installer) > /etc/shells
+rm -f /etc/shells.bak
 
 echo "Registering root shell"
 pw usermod -n root -s /usr/local/etc/rc.initial
diff --git a/+PRE_DEINSTALL b/+PRE_DEINSTALL
index f5360f341..15cc55274 100644
--- a/+PRE_DEINSTALL
+++ b/+PRE_DEINSTALL
@@ -5,6 +5,9 @@ echo "Updating /etc/shells"
 cp /etc/shells /etc/shells.bak
 (grep -v /usr/local/etc/rc.initial /etc/shells.bak) > /etc/shells
 rm -f /etc/shells.bak
+cp /etc/shells /etc/shells.bak
+(grep -v /usr/local/etc/rc.installer /etc/shells.bak) > /etc/shells
+rm -f /etc/shells.bak
 
 echo "Updating /boot/loader.conf"
 touch /boot/loader.conf