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