diff --git a/config/forwardfw/convert-dmz b/config/firewall/convert-dmz
similarity index 100%
rename from config/forwardfw/convert-dmz
rename to config/firewall/convert-dmz
diff --git a/config/forwardfw/convert-outgoingfw b/config/firewall/convert-outgoingfw
similarity index 100%
rename from config/forwardfw/convert-outgoingfw
rename to config/firewall/convert-outgoingfw
diff --git a/config/forwardfw/convert-portfw b/config/firewall/convert-portfw
similarity index 100%
rename from config/forwardfw/convert-portfw
rename to config/firewall/convert-portfw
diff --git a/config/forwardfw/convert-xtaccess b/config/firewall/convert-xtaccess
similarity index 100%
rename from config/forwardfw/convert-xtaccess
rename to config/firewall/convert-xtaccess
diff --git a/config/forwardfw/firewall-lib.pl b/config/firewall/firewall-lib.pl
similarity index 100%
rename from config/forwardfw/firewall-lib.pl
rename to config/firewall/firewall-lib.pl
diff --git a/config/forwardfw/firewall-policy b/config/firewall/firewall-policy
similarity index 100%
rename from config/forwardfw/firewall-policy
rename to config/firewall/firewall-policy
diff --git a/config/forwardfw/p2protocols b/config/firewall/p2protocols
similarity index 100%
rename from config/forwardfw/p2protocols
rename to config/firewall/p2protocols
diff --git a/config/forwardfw/rules.pl b/config/firewall/rules.pl
similarity index 100%
rename from config/forwardfw/rules.pl
rename to config/firewall/rules.pl
diff --git a/lfs/configroot b/lfs/configroot
index 555c782ed..05ceb3e85 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -99,14 +99,14 @@ $(TARGET) :
 	cp $(DIR_SRC)/config/cfgroot/useragents			$(CONFIG_ROOT)/proxy/advanced
 	cp $(DIR_SRC)/config/cfgroot/ethernet-vlans		$(CONFIG_ROOT)/ethernet/vlans
 	cp $(DIR_SRC)/langs/list						$(CONFIG_ROOT)/langs/
-	cp $(DIR_SRC)/config/forwardfw/rules.pl			$(CONFIG_ROOT)/forward/bin/rules.pl
-	cp $(DIR_SRC)/config/forwardfw/convert-xtaccess	/usr/sbin/convert-xtaccess
-	cp $(DIR_SRC)/config/forwardfw/convert-outgoingfw	/usr/sbin/convert-outgoingfw
-	cp $(DIR_SRC)/config/forwardfw/convert-dmz	/usr/sbin/convert-dmz
-	cp $(DIR_SRC)/config/forwardfw/convert-portfw	/usr/sbin/convert-portfw
-	cp $(DIR_SRC)/config/forwardfw/p2protocols		$(CONFIG_ROOT)/forward/p2protocols
-	cp $(DIR_SRC)/config/forwardfw/firewall-lib.pl	$(CONFIG_ROOT)/forward/bin/firewall-lib.pl
-	cp $(DIR_SRC)/config/forwardfw/firewall-policy	/usr/sbin/firewall-policy
+	cp $(DIR_SRC)/config/firewall/rules.pl			$(CONFIG_ROOT)/forward/bin/rules.pl
+	cp $(DIR_SRC)/config/firewall/convert-xtaccess	/usr/sbin/convert-xtaccess
+	cp $(DIR_SRC)/config/firewall/convert-outgoingfw	/usr/sbin/convert-outgoingfw
+	cp $(DIR_SRC)/config/firewall/convert-dmz	/usr/sbin/convert-dmz
+	cp $(DIR_SRC)/config/firewall/convert-portfw	/usr/sbin/convert-portfw
+	cp $(DIR_SRC)/config/firewall/p2protocols		$(CONFIG_ROOT)/forward/p2protocols
+	cp $(DIR_SRC)/config/firewall/firewall-lib.pl	$(CONFIG_ROOT)/forward/bin/firewall-lib.pl
+	cp $(DIR_SRC)/config/firewall/firewall-policy	/usr/sbin/firewall-policy
 	cp $(DIR_SRC)/config/fwhosts/icmp-types			$(CONFIG_ROOT)/fwhosts/icmp-types
 	cp $(DIR_SRC)/config/fwhosts/customservices		$(CONFIG_ROOT)/fwhosts/customservices
 	# Oneliner configfiles