diff --git a/config/rootfiles/core/147/filelists/files b/config/rootfiles/core/147/filelists/files
index ce4e51768..ec47d36d3 100644
--- a/config/rootfiles/core/147/filelists/files
+++ b/config/rootfiles/core/147/filelists/files
@@ -2,3 +2,4 @@ etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs
+etc/rc.d/init.d/firewall
diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall
index 00512d9fa..b0890c717 100644
--- a/src/initscripts/system/firewall
+++ b/src/initscripts/system/firewall
@@ -96,6 +96,9 @@ iptables_init() {
 
 	# Conntrack helpers (https://home.regit.org/netfilter-en/secure-use-of-helpers/)
 
+	# GRE (always enabled)
+	modprobe nf_conntrack_proto_gre
+
 	# SIP
 	if [ "${CONNTRACK_SIP}" = "on" ]; then
 		modprobe nf_nat_sip