diff --git a/modules b/modules
index 39e7256..ae2d989 100644
--- a/modules
+++ b/modules
@@ -1,5 +1,10 @@
-GLUON_SITE_FEEDS='ffhb'
+GLUON_SITE_FEEDS='ffhb ssidchanger'
 
 PACKAGES_FFHB_REPO=https://code.bremen.freifunk.net/ffhb/firmware/ffhb-packages.git
 PACKAGES_FFHB_COMMIT=0e2480415815655232cffe53b5329c73f211088c
 PACKAGES_FFHB_BRANCH=events
+
+
+PACKAGES_SSIDCHANGER_REPO=https://github.com/freifunk-nord/gluon-ssid-changer.git
+PACKAGES_SSIDCHANGER_COMMIT=f266b9e6328f97354f3b8777d1111ad044be9be5
+PACKAGES_SSIDCHANGER_BRANCH=2018.1.x
diff --git a/site.mk b/site.mk
index df47046..c2d79e8 100755
--- a/site.mk
+++ b/site.mk
@@ -1,17 +1,16 @@
+GLUON_FEATURES := \
+       respondd \
+       status-page
+
 GLUON_SITE_PACKAGES := \
-	gluon-respondd \
+	gluon-ssid-changer \
 	respondd-module-airtime \
 	gluon-config-mode-core \
 	gluon-config-mode-hostname \
-	gluon-config-mode-geo-location \
 	gluon-config-mode-contact-info \
-	gluon-web-admin \
-	gluon-web-network \
-	gluon-web-wifi-config \
+	gluon-config-mode-geo-location \
 	gluon-client-bridge \
-	gluon-setup-mode \
 	gluon-speedtest \
-	gluon-status-page \
 	iwinfo \
 	firewall \
 	haveged \
@@ -19,12 +18,11 @@ GLUON_SITE_PACKAGES := \
 	respondd-wifi \
 	respondd-module-wifisettings \
 	respondd-module-interface-address \
-	ffhb-breminale \
 	reghack
 
 # Allow overriding the these variables from the command line
 GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))
-GLUON_AUTOUPDATE_BRANCH ?= stabel
+GLUON_AUTOUPDATE_BRANCH ?= stable
 GLUON_AUTOUPDATER_ENABLED ?= 1
 GLUON_PRIORITY ?= 0
 GLUON_DEPRECATED ?= 0