diff --git a/Makefile b/Makefile
index 4420b387..f8a4f85e 100644
--- a/Makefile
+++ b/Makefile
@@ -383,7 +383,7 @@ image: FORCE
 	+$(GLUONMAKE) opkg_config GLUON_OPKG_CONFIG=1
 
 	$(call Image/mkfs/prepare)
-	$(_SINGLE)$(NO_TRACE_MAKE) -C $(TOPDIR)/target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 IMG_PREFIX=gluon \
+	$(_SINGLE)$(NO_TRACE_MAKE) -C $(TOPDIR)/target/linux/$(BOARD)/image install TARGET_BUILD=1 IMG_PREFIX=gluon \
 		PROFILE="$(PROFILE)" KDIR="$(PROFILE_KDIR)" TARGET_DIR="$(TARGET_DIR)" BIN_DIR="$(BIN_DIR)" TMP_DIR="$(TMP_DIR)"
 
 	$(foreach model,$(GLUON_$(PROFILE)_MODELS), \
diff --git a/modules b/modules
index d0c43d05..d783d9e4 100644
--- a/modules
+++ b/modules
@@ -1,19 +1,19 @@
 GLUON_FEEDS='openwrt gluon routing luci'
 
 OPENWRT_REPO=git://git.openwrt.org/openwrt.git
-OPENWRT_COMMIT=53a178af743eb1a463c806ee79d1e622969ad6ef
+OPENWRT_COMMIT=3691a2518048cc8f1e5ba5952d506b87e2a0be6f
 
 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
-PACKAGES_OPENWRT_COMMIT=914beae80e848c161214464fba7a9826c66bbf26
+PACKAGES_OPENWRT_COMMIT=20a7734215aa844d5e961ee846f7048b04361838
 PACKAGES_OPENWRT_BRANCH=for-15.05
 
 PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=dcc5a5ab74822492877eadcba5fc3ad845ee65db
 
 PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
-PACKAGES_ROUTING_COMMIT=b1c3bdfbf47003088198bf8ef699a94cc29e3eca
+PACKAGES_ROUTING_COMMIT=2bca6fb55f898c08e4227d35533fda2486c8983c
 PACKAGES_ROUTING_BRANCH=for-15.05
 
 PACKAGES_LUCI_REPO=git://github.com/openwrt/luci.git
-PACKAGES_LUCI_COMMIT=7a54785ea616df1e72f20b9cad2f1a6b3097f7b5
+PACKAGES_LUCI_COMMIT=a497fbab4c4d7e3228c67a93e107000f7e70fd1f
 PACKAGES_LUCI_BRANCH=for-15.05
diff --git a/patches/openwrt/0008-mac80211-ath10k-allow-simultaneous-AP-IBSS.patch b/patches/openwrt/0007-mac80211-ath10k-allow-simultaneous-AP-IBSS.patch
similarity index 100%
rename from patches/openwrt/0008-mac80211-ath10k-allow-simultaneous-AP-IBSS.patch
rename to patches/openwrt/0007-mac80211-ath10k-allow-simultaneous-AP-IBSS.patch
diff --git a/patches/openwrt/0007-ncurses-fix-host-build-with-GCC-5.1.patch b/patches/openwrt/0007-ncurses-fix-host-build-with-GCC-5.1.patch
deleted file mode 100644
index 366039ff..00000000
--- a/patches/openwrt/0007-ncurses-fix-host-build-with-GCC-5.1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 20 May 2015 21:56:14 +0200
-Subject: ncurses: fix host build with GCC 5.1
-
-diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
-index 13c7962..39851a6 100644
---- a/package/libs/ncurses/Makefile
-+++ b/package/libs/ncurses/Makefile
-@@ -82,6 +82,12 @@ HOST_CONFIGURE_ARGS += \
- 	--without-tests \
- 	--without-curses-h
- 
-+HOST_CONFIGURE_VARS = \
-+        CC="$(HOSTCC)" \
-+        CFLAGS="$(HOST_CFLAGS)" \
-+        CPPFLAGS="$(HOST_CPPFLAGS) -P" \
-+        LDFLAGS="$(HOST_LDFLAGS)" \
-+        SHELL="$(SHELL)"
- 
- ifeq ($(HOST_OS),FreeBSD)
- 	CONFIGURE_ARGS +=
diff --git a/patches/openwrt/0009-iwinfo-update-NanoStation-Loco-txpower-offsets.patch b/patches/openwrt/0008-iwinfo-update-NanoStation-Loco-txpower-offsets.patch
similarity index 100%
rename from patches/openwrt/0009-iwinfo-update-NanoStation-Loco-txpower-offsets.patch
rename to patches/openwrt/0008-iwinfo-update-NanoStation-Loco-txpower-offsets.patch