diff --git a/README.md b/README.md
index 00e1b9826158721787e3700964b1057f5c6b4d62..0eb52a49871c831f874cfa8c51c4b6babccfb1b1 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ Freifunk Stuttgart specific Gluon configuration
 Doku: https://gluon.readthedocs.org/en/latest/user/site.html
 
 Gluon versions used for specific Stuttgart Freifunk Firmware builds:
+* ffs-1.0: v2016.2.2
 * ffs-0.9: v2016.2.1
 * ffs-0.8: v2016.2
 * ffs-0.7: v2016.1.3
diff --git a/i18n/de.po b/i18n/de.po
index e34a9f1d1bdf5b3f0be8c2abf223445044d2c318..a84caadc7bb7e4ebd84f65d0931607582efae785 100644
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -54,4 +54,10 @@ msgstr ""
 "Viel Spaß mit deinem Knoten und bei der Erkundung von Freifunk!<br /> "
 "<small>Hilf uns weitere Anleitungen, Texte, Grafiken, Applikationen, Schaubilder, und ähnliches zu erstellen die wir hier verlinken können, um jedem neuen Freifunker einen guten Start zu ermöglichen</small>"
 
+msgid "gluon-config-mode:altitude-label"
+msgstr "Höhe"
 
+msgid "gluon-config-mode:altitude-help"
+msgstr ""
+"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
+"exakter Wert bekannt ist."
diff --git a/i18n/en.po b/i18n/en.po
index 764062cfe2ec9185239d5b9de30c00dacd74a28c..72dfcca4b3dcb21348628dab7213ced0c4019f97 100644
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -44,3 +44,11 @@ msgstr ""
 "10 seconds during normal operation. The device will then reboot into config "
 "mode.</p>"
 "<p>Have fun with your node and exploring the Freifunk network!</p>"
+
+msgid "gluon-config-mode:altitude-label"
+msgstr "Altitude"
+
+msgid "gluon-config-mode:altitude-help"
+msgstr ""
+"Specifying the altitude is optional and should only be done if a proper "
+"value is known."
diff --git a/i18n/gluon-site.pot b/i18n/gluon-site.pot
index 670de4107f99ccdc03c2faf70ed7bb3487f1ef01..a161a12b04c6dbe3175905ae6e8118babe76ef67 100644
--- a/i18n/gluon-site.pot
+++ b/i18n/gluon-site.pot
@@ -9,3 +9,9 @@ msgstr ""
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
+
+msgid "gluon-config-mode:altitude-label"
+msgstr ""
+
+msgid "gluon-config-mode:altitude-help"
+msgstr ""
diff --git a/modules b/modules
index 666209c1e309d63fad590a0b35c8bb195328a499..c4788d45a5178db7a83d99149a115173dfe7317c 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,4 @@
-GLUON_SITE_FEEDS='ffrn'
+GLUON_SITE_FEEDS='ffs'
 
-PACKAGES_FFRN_REPO=https://github.com/Freifunk-Rhein-Neckar/ffrn-packages.git
-PACKAGES_FFRN_COMMIT=d45f18baf0df1bbfaf3f9328526d5cb5da3fc337
+PACKAGES_FFS_REPO=https://github.com/freifunk-stuttgart/Gluon-Packages
+PACKAGES_FFS_COMMIT=5452ccc85d87b957c9613d8ba61e81891150eee0
diff --git a/site.mk b/site.mk
index f2b5db07240f92ceb7239601f4188291f7446b30..b63d8d6abe8349b3258ce3219a6bca22812b2756 100644
--- a/site.mk
+++ b/site.mk
@@ -25,7 +25,7 @@ GLUON_SITE_PACKAGES := \
 	haveged \
 	iptables \
 	iwinfo \
-	ffrn-lowmem-patches \
+	ffs-lowmem-patches \
 
 # add addition network drivers and usb support only to targes where disk space does not matter.
 ifeq ($(GLUON_TARGET),x86-generic)
@@ -45,7 +45,7 @@ GLUON_SITE_PACKAGES += \
 	kmod-igb
 endif
 
-DEFAULT_GLUON_RELEASE := 0.9+$(shell date '+%Y.%m.%d')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
+DEFAULT_GLUON_RELEASE := 1.0+$(shell date '+%Y.%m.%d')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
 
 GLUON_LANGS := de en