diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files
index 353b6168c..ab268092a 100644
--- a/config/rootfiles/core/38/filelists/files
+++ b/config/rootfiles/core/38/filelists/files
@@ -18,6 +18,7 @@ var/ipfire/langs/en.pl
 var/ipfire/langs/fr.pl
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/ipsec
+etc/rc.d/init.d/network
 etc/rc.d/init.d/ntp
 etc/rc.d/init.d/modules
 usr/local/bin/ipsecctrl
diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 9c7e3ac11..7f27a65a8 100644
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -27,7 +27,12 @@ init_networking() {
 	done
 	(exit ${failed})
 	evaluate_retval
-                        
+
+	if [ -e /var/ipfire/main/disable_nf_sip ]; then
+		rmmod nf_nat_sip
+		rmmod nf_conntrack_sip
+	fi
+
 	boot_mesg "Setting up firewall"
 	/etc/rc.d/init.d/firewall start; evaluate_retval