diff --git a/i18n/de.po b/i18n/de.po
index a84caadc7bb7e4ebd84f65d0931607582efae785..20b4449b4625cfeb1e6bfbaf02d39c2eca8fe3dd 100644
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -61,3 +61,9 @@ msgid "gluon-config-mode:altitude-help"
 msgstr ""
 "Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
 "exakter Wert bekannt ist."
+
+msgid "gluon-config-mode:zip-help"
+"Some nice Text about the ZIP-Code "
+"and how it help for subnetting."
+msgstr ""
+"Die PLZ hilft dem Freifunk-Knoten automatisch die beste Gegenstelle (Segment) auszuwählen."
diff --git a/i18n/en.po b/i18n/en.po
index 001af832b235703d54e0235b397ad2c58300cf00..37594691228d3df4ca4afed14cc884ce7f6e68ed 100644
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -52,3 +52,9 @@ msgid "gluon-config-mode:altitude-help"
 msgstr ""
 "Specifying the altitude is optional and should only be done if a proper "
 "value is known."
+
+msgid "gluon-config-mode:zip-help"
+"Some nice Text about the ZIP-Code "
+"and how it help for subnetting."
+msgstr ""
+"ZIP-Codes are used to automatically assign your Freifunk-Node to the right Segment."
diff --git a/modules b/modules
index c4788d45a5178db7a83d99149a115173dfe7317c..fa78ca3cfb5892de6cf8c938f000f383fbfb0dc9 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,4 @@
 GLUON_SITE_FEEDS='ffs'
 
 PACKAGES_FFS_REPO=https://github.com/freifunk-stuttgart/Gluon-Packages
-PACKAGES_FFS_COMMIT=5452ccc85d87b957c9613d8ba61e81891150eee0
+PACKAGES_FFS_COMMIT=ba16b8bddc39bf4d476b6a8c28a029b5b8341ada
diff --git a/site.mk b/site.mk
index 55bcfdf32f81060693dae9d0b7027756e032719e..79469e33c4bafaa35e8ccbed35f6c7d105b366dd 100644
--- a/site.mk
+++ b/site.mk
@@ -9,6 +9,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-hostname \
 	gluon-config-mode-mesh-vpn \
+	gluon-config-mode-zip \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-luci-admin \
@@ -25,7 +26,7 @@ GLUON_SITE_PACKAGES := \
 	haveged \
 	iptables \
 	iwinfo \
-	ffs-lowmem-patches \
+	ffs-set-segment \
 
 # add addition network drivers and usb support only to targes where disk space does not matter.
 ifeq ($(GLUON_TARGET),x86-generic)