diff --git a/modules b/modules
index 6280db3b2e762671c1f8cf79328766f3d79d5078..d4458bfa7869859c34bcee76d95d62447b72d5ba 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,8 @@
-GLUON_SITE_FEEDS='ffs'
+GLUON_SITE_FEEDS='ffs ssidchanger'
 
 PACKAGES_FFS_REPO=https://github.com/freifunk-stuttgart/Gluon-Packages
 PACKAGES_FFS_COMMIT=cb5fd4bb2a5b9cd2d42f89de9e750a8eec9c3f5d
+
+PACKAGES_SSIDCHANGER_REPO=https://github.com/freifunk-nord/gluon-ssid-changer.git
+PACKAGES_SSIDCHANGER_COMMIT=3c6750ce8fc9cedabfa8a6f479fb12d343c6ecc2
+PACKAGES_SSIDCHANGER_BRANCH=2018.1.x
diff --git a/site.conf b/site.conf
index 405a5b622c0fe88312d192754589cd3c5577d81d..0ea780db3953422f677d29418e8bacbf4e506013 100644
--- a/site.conf
+++ b/site.conf
@@ -43,6 +43,18 @@
         },
     },
 
+    ssid_changer = {
+	enabled = true,
+	switch_timeframe = 30,
+	first = 5,
+	prefix = 'FFS_Offline_',
+	suffix = 'nodename',
+
+	tq_limit_enabled = false,
+	tq_limit_max = 45,
+	tq_limit_min = 35
+    },
+
     mesh = {
         vxlan = false,
     },
diff --git a/site.mk b/site.mk
index 928052dd0cc55c80455070aa67bc88f621079ad6..b852d0d846e6792b4ef81e920f6ab854ac05838f 100644
--- a/site.mk
+++ b/site.mk
@@ -35,6 +35,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-radvd \
 	gluon-radv-filterd \
 	gluon-setup-mode \
+	gluon-ssid-changer \
 	gluon-status-page \
 	haveged \
 	iptables \