diff --git a/src/packages/fff/fff-babeld/Makefile b/src/packages/fff/fff-babeld/Makefile
index ba8a7609..77c0dbcf 100644
--- a/src/packages/fff/fff-babeld/Makefile
+++ b/src/packages/fff/fff-babeld/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-babeld
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-babeld
 
diff --git a/src/packages/fff/fff-babeld/files/etc/gateway.d/40-babel b/src/packages/fff/fff-babeld/files/etc/layer3.d/40-babel
similarity index 100%
rename from src/packages/fff/fff-babeld/files/etc/gateway.d/40-babel
rename to src/packages/fff/fff-babeld/files/etc/layer3.d/40-babel
diff --git a/src/packages/fff/fff-dhcp/Makefile b/src/packages/fff/fff-dhcp/Makefile
index 3f0d65c9..a396b8b2 100644
--- a/src/packages/fff/fff-dhcp/Makefile
+++ b/src/packages/fff/fff-dhcp/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-dhcp
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-dhcp
 
diff --git a/src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns b/src/packages/fff/fff-dhcp/files/etc/layer3.d/35-dns
similarity index 100%
rename from src/packages/fff/fff-dhcp/files/etc/gateway.d/35-dns
rename to src/packages/fff/fff-dhcp/files/etc/layer3.d/35-dns
diff --git a/src/packages/fff/fff-gateway/Makefile b/src/packages/fff/fff-gateway/Makefile
index 6a9afd03..8ea76e0a 100644
--- a/src/packages/fff/fff-gateway/Makefile
+++ b/src/packages/fff/fff-gateway/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-gateway
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-gateway
 
@@ -16,6 +16,7 @@ define Package/fff-gateway
 	         +fff-babeld \
 	         +fff-boardname \
 	         +fff-dhcp \
+	         +fff-layer3-config \
 	         +fff-network \
 	         +fff-ra \
 	         +fff-wireguard \
diff --git a/src/packages/fff/fff-layer3-config/Makefile b/src/packages/fff/fff-layer3-config/Makefile
new file mode 100644
index 00000000..3cd2c029
--- /dev/null
+++ b/src/packages/fff/fff-layer3-config/Makefile
@@ -0,0 +1,42 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fff-layer3-config
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/fff-layer3-config
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fff-layer3-config
+	SECTION:=base
+	CATEGORY:=Freifunk
+	TITLE:=Freifunk-Franken Layer3 firmware configuration tools
+	URL:=https://www.freifunk-franken.de
+	DEPENDS:= \
+		+fff-boardname \
+		+fff-config \
+		+fff-dhcp \
+		+fff-network
+endef
+
+define Package/fff-layer3-config/description
+	This package provides the means for configuring the gateway
+endef
+
+define Build/Prepare
+	echo "all: " > $(PKG_BUILD_DIR)/Makefile
+endef
+
+define Build/Configure
+	# nothing
+endef
+
+define Build/Compile
+	# nothing
+endef
+
+define Package/fff-layer3-config/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,fff-layer3-config))
diff --git a/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version b/src/packages/fff/fff-layer3-config/files/etc/layer3.d/01-version
similarity index 100%
rename from src/packages/fff/fff-gateway/files/etc/gateway.d/01-version
rename to src/packages/fff/fff-layer3-config/files/etc/layer3.d/01-version
diff --git a/src/packages/fff/fff-gateway/files/etc/gateway.d/10-meta b/src/packages/fff/fff-layer3-config/files/etc/layer3.d/10-meta
similarity index 100%
rename from src/packages/fff/fff-gateway/files/etc/gateway.d/10-meta
rename to src/packages/fff/fff-layer3-config/files/etc/layer3.d/10-meta
diff --git a/src/packages/fff/fff-gateway/files/etc/gateway.d/20-vlan b/src/packages/fff/fff-layer3-config/files/etc/layer3.d/20-vlan
similarity index 100%
rename from src/packages/fff/fff-gateway/files/etc/gateway.d/20-vlan
rename to src/packages/fff/fff-layer3-config/files/etc/layer3.d/20-vlan
diff --git a/src/packages/fff/fff-gateway/files/etc/gateway.d/30-network-client b/src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-client
similarity index 100%
rename from src/packages/fff/fff-gateway/files/etc/gateway.d/30-network-client
rename to src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-client
diff --git a/src/packages/fff/fff-gateway/files/usr/sbin/configuregateway b/src/packages/fff/fff-layer3-config/files/usr/sbin/configure-layer3
similarity index 98%
rename from src/packages/fff/fff-gateway/files/usr/sbin/configuregateway
rename to src/packages/fff/fff-layer3-config/files/usr/sbin/configure-layer3
index 3594a440..20a6a26e 100755
--- a/src/packages/fff/fff-gateway/files/usr/sbin/configuregateway
+++ b/src/packages/fff/fff-layer3-config/files/usr/sbin/configure-layer3
@@ -18,7 +18,7 @@ execute_subshell() {
 		echo "Usage:" "$0" "<function>"
 	fi
 
-	for script in /etc/gateway.d/*; do
+	for script in /etc/layer3.d/*; do
 		(
 			# unset function to prevent executing parents shell function
 			unset -f "$1"
diff --git a/src/packages/fff/fff-wireguard/Makefile b/src/packages/fff/fff-wireguard/Makefile
index dc51c18c..92bcec3f 100644
--- a/src/packages/fff/fff-wireguard/Makefile
+++ b/src/packages/fff/fff-wireguard/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-wireguard
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-wireguard
 
diff --git a/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard b/src/packages/fff/fff-wireguard/files/etc/layer3.d/50-wireguard
similarity index 100%
rename from src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
rename to src/packages/fff/fff-wireguard/files/etc/layer3.d/50-wireguard
diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile
index 23fd7990..c24f5a21 100644
--- a/src/packages/fff/fff-wireless/Makefile
+++ b/src/packages/fff/fff-wireless/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-wireless
-PKG_RELEASE:=18
+PKG_RELEASE:=19
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/src/packages/fff/fff-wireless/files/etc/gateway.d/28-wifi b/src/packages/fff/fff-wireless/files/etc/layer3.d/28-wifi
similarity index 100%
rename from src/packages/fff/fff-wireless/files/etc/gateway.d/28-wifi
rename to src/packages/fff/fff-wireless/files/etc/layer3.d/28-wifi