diff --git a/config/rootfiles/common/ppp b/config/rootfiles/common/ppp
index 8d0af69c4..d61fdf811 100644
--- a/config/rootfiles/common/ppp
+++ b/config/rootfiles/common/ppp
@@ -38,18 +38,18 @@ etc/ppp/standardloginscript
 #usr/include/pppd/upap.h
 usr/lib/pppd
 usr/lib/pppd/2.4.9
-#usr/lib/pppd/2.4.9/minconn.so
-#usr/lib/pppd/2.4.9/openl2tp.so
-#usr/lib/pppd/2.4.9/passprompt.so
-#usr/lib/pppd/2.4.9/passwordfd.so
-#usr/lib/pppd/2.4.9/pppoatm.so
-#usr/lib/pppd/2.4.9/pppoe.so
-#usr/lib/pppd/2.4.9/pppol2tp.so
-#usr/lib/pppd/2.4.9/radattr.so
-#usr/lib/pppd/2.4.9/radius.so
-#usr/lib/pppd/2.4.9/radrealms.so
-#usr/lib/pppd/2.4.9/rp-pppoe.so
-#usr/lib/pppd/2.4.9/winbind.so
+usr/lib/pppd/2.4.9/minconn.so
+usr/lib/pppd/2.4.9/openl2tp.so
+usr/lib/pppd/2.4.9/passprompt.so
+usr/lib/pppd/2.4.9/passwordfd.so
+usr/lib/pppd/2.4.9/pppoatm.so
+usr/lib/pppd/2.4.9/pppoe.so
+usr/lib/pppd/2.4.9/pppol2tp.so
+usr/lib/pppd/2.4.9/radattr.so
+usr/lib/pppd/2.4.9/radius.so
+usr/lib/pppd/2.4.9/radrealms.so
+usr/lib/pppd/2.4.9/rp-pppoe.so
+usr/lib/pppd/2.4.9/winbind.so
 usr/sbin/chat
 usr/sbin/pppd
 usr/sbin/pppdump
diff --git a/config/rootfiles/core/158/filelists/backup b/config/rootfiles/core/158/filelists/backup
new file mode 120000
index 000000000..38e28a8b4
--- /dev/null
+++ b/config/rootfiles/core/158/filelists/backup
@@ -0,0 +1 @@
+../../../common/backup
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/157/update.sh b/config/rootfiles/oldcore/157/update.sh
index ce7b6f5bf..94b10723f 100644
--- a/config/rootfiles/oldcore/157/update.sh
+++ b/config/rootfiles/oldcore/157/update.sh
@@ -97,6 +97,9 @@ extract_files
 # update linker config
 ldconfig
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
@@ -121,6 +124,10 @@ rm -f \
 	/usr/lib/dma-mbox-create \
 	/usr/lib/openssh/ssh-keysign
 
+# Delete orphaned pppd 2.4.8 shared object files
+rm -rf \
+	/usr/lib/pppd/2.4.8/
+
 # Start services
 /etc/init.d/sshd restart
 /etc/init.d/apache restart
diff --git a/config/rootfiles/packages/icinga b/config/rootfiles/packages/icinga
index f81ba9db2..000be6346 100644
--- a/config/rootfiles/packages/icinga
+++ b/config/rootfiles/packages/icinga
@@ -25,7 +25,7 @@ usr/bin/icinga
 usr/bin/icingastats
 #usr/lib/icinga
 usr/lib/icinga/p1.pl
-usr/lib/nagios/plugins/eventhandlers
+#usr/lib/nagios/plugins/eventhandlers
 #usr/lib/nagios/plugins/eventhandlers/disable_active_service_checks
 #usr/lib/nagios/plugins/eventhandlers/disable_notifications
 #usr/lib/nagios/plugins/eventhandlers/distributed-monitoring
diff --git a/lfs/icinga b/lfs/icinga
index 6534722ac..456f66388 100644
--- a/lfs/icinga
+++ b/lfs/icinga
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = icinga
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = nagios-plugins
 
diff --git a/lfs/nagios-plugins b/lfs/nagios-plugins
index d35a94bbe..cdf1910b0 100644
--- a/lfs/nagios-plugins
+++ b/lfs/nagios-plugins
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios-plugins
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       =
 
@@ -92,4 +92,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Prevent Nagios plugins from being owned (and hence writeable) by "nobody"
 	chown root:root -R /usr/lib/nagios/plugins
 
+	# Unfortunately, some of these plugins need the SUID bit to do their work properly
+	chmod +s \
+		/usr/lib/nagios/plugins/check_dhcp \
+		/usr/lib/nagios/plugins/check_icmp \
+		/usr/lib/nagios/plugins/check_ide_smart \
+		/usr/lib/nagios/plugins/check_ping
+
 	@$(POSTBUILD)