diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh
index e4ee15b52..310f669c1 100644
--- a/config/rootfiles/core/120/update.sh
+++ b/config/rootfiles/core/120/update.sh
@@ -86,6 +86,12 @@ done
 # Remove deprecated SSH configuration option
 sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
 
+# Remove forgotten Nagios files, if any...
+test -f /etc/rc.d/init.d/nagios && rm -f /etc/rc.d/init.d/nagios
+test -f /usr/bin/nagios && rm -f /usr/bin/nagios
+test -d /usr/share/nagios/ && rm -rf /usr/share/nagios/
+test -d /var/nagios/ && rm -rf /var/nagios/
+
 # Remove any pakfire keys stored in /
 rm -rfv /.gnupg