diff --git a/modules b/modules
index 3669cdb4d86919c50bf768cc4adb5e816b12ec6b..3de1b8d6b039b711802df8955a87db24e4e45d7f 100644
--- a/modules
+++ b/modules
@@ -1,8 +1,8 @@
 GLUON_SITE_FEEDS='ffnw netmon'
 
 PACKAGES_FFNW_REPO=https://git.nordwest.freifunk.net/ffnw-firmware/packages.git
-PACKAGES_FFNW_BRANCH=201705
-PACKAGES_FFNW_COMMIT=5704b555a20cfb62983682086716a90ac66bb8a4
+PACKAGES_FFNW_BRANCH=master
+PACKAGES_FFNW_COMMIT=97569793a97f796019e53964d4802d658c6d02d8
 
 PACKAGES_NETMON_REPO=https://git.ffnw.de/netmon-sc/openwrt-feed.git
 PACKAGES_NETMON_BRANCH=master
diff --git a/site.conf b/site.conf
index eb276c080517c1cf88239b8af9bb91a6e71dd844..0e30fb86f051dc40d2b053f14e592ec4e3274865 100644
--- a/site.conf
+++ b/site.conf
@@ -99,7 +99,7 @@
 			stable = {
 				name = 'stable',
 				mirrors = {
-					'http://autoupdate.ffnw/stable',
+					'http://autoupdate-lede.ffnw/stable',
 				},
 				good_signatures = 4,
 				pubkeys = {
@@ -118,7 +118,7 @@
 			testing = {
 				name = 'testing',
 				mirrors = {
-					'http://autoupdate.ffnw/testing',
+					'http://autoupdate-lede.ffnw/testing',
 				},
 				good_signatures = 1,
 				pubkeys = {
@@ -136,7 +136,7 @@
 			nightly_master = {
 				name = 'nightly_master',
 				mirrors = {
-					'http://autoupdate.ffnw/nightly/master',
+					'http://autoupdate-lede.ffnw/nightly/master',
 				},
 				good_signatures = 1,
 				pubkeys = {
diff --git a/site.mk b/site.mk
index 662404af76f8b049bd25f683130d272bbc284921..6afb9fc44e5c80bedbd5f83e2f61c8936fb01aeb 100644
--- a/site.mk
+++ b/site.mk
@@ -27,7 +27,8 @@ GLUON_SITE_PACKAGES := \
 	ffnw-hoodselector \
 	ffnw-multiple-v6-watchdoog \
 	ffnw-hoodselector-ctl \
-	netmon-node-client
+	netmon-node-client \
+	ffnw-disable-11s \
 
 USB_BASIC := \
 	kmod-usb-core \