diff --git a/config/rootfiles/packages/nagios_nrpe b/config/rootfiles/packages/nagios_nrpe
index 1da6c3baf..6698c587a 100644
--- a/config/rootfiles/packages/nagios_nrpe
+++ b/config/rootfiles/packages/nagios_nrpe
@@ -1,6 +1,9 @@
 etc/nagios
 etc/nagios/nrpe.cfg
-etc/rc.d/init.d/nrpe
+etc/rc.d/init.d/nagios_nrpe
+etc/rc.d/rc0.d/K20nagios_nrpe
+etc/rc.d/rc3.d/S40nagios_nrpe
+etc/rc.d/rc6.d/K20nagios_nrpe
 #root/.rnd
 #usr/bin/nrpe-uninstall
 usr/bin/nrpe
diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe
index bb736a997..3deb5dcc6 100644
--- a/lfs/nagios_nrpe
+++ b/lfs/nagios_nrpe
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios_nrpe
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = nagios-plugins
 
@@ -93,7 +93,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make install-config
 
 	# install initscript
-	$(call INSTALL_INITSCRIPT,nrpe)
+	$(call INSTALL_INITSCRIPT,nagios_nrpe)
+
+	# Install start links
+	ln -sf ../init.d/nagios_nrpe /etc/rc.d/rc3.d/S40nagios_nrpe
+	ln -sf ../init.d/nagios_nrpe /etc/rc.d/rc0.d/K20nagios_nrpe
+	ln -sf ../init.d/nagios_nrpe /etc/rc.d/rc6.d/K20nagios_nrpe
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/initscripts/packages/nrpe b/src/initscripts/packages/nagios_nrpe
similarity index 100%
rename from src/initscripts/packages/nrpe
rename to src/initscripts/packages/nagios_nrpe