diff --git a/modules b/modules
index 582d6bf2a90bbea7c9a32a927bcd4b7eebdb6bc1..ba40edc7435ffc4cd2ca61b201735ae3a24c94d4 100644
--- a/modules
+++ b/modules
@@ -1,7 +1,7 @@
GLUON_FEEDS='openwrt gluon routing luci'
OPENWRT_REPO=git://git.openwrt.org/15.05/openwrt.git
-OPENWRT_COMMIT=23395d539f4a45d8bed611e7f9c64275cd1cce0e
+OPENWRT_COMMIT=ba0cac08164150e74567787251e44b4d0d0dc140
PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
PACKAGES_OPENWRT_COMMIT=9622fe984bba3a4547f48bc507ebaba7637eb2b0
diff --git a/patches/openwrt/0019-ar71xx-make-bootconsole-wait-for-both-THRE-and-TEMT.patch b/patches/openwrt/0019-ar71xx-make-bootconsole-wait-for-both-THRE-and-TEMT.patch
deleted file mode 100644
index 76a41dce1ee14c1a072c8c3b8a066b3f0a5a54f2..0000000000000000000000000000000000000000
--- a/patches/openwrt/0019-ar71xx-make-bootconsole-wait-for-both-THRE-and-TEMT.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 24 Mar 2016 18:30:26 +0100
-Subject: ar71xx: make bootconsole wait for both THRE and TEMT
-
-Original commit message:
-
- MIPS: ath79: make bootconsole wait for both THRE and TEMT
-
- This makes the ath79 bootconsole behave the same way as the generic 8250
- bootconsole.
-
- Also waiting for TEMT (transmit buffer is empty) instead of just THRE
- (transmit buffer is not full) ensures that all characters have been
- transmitted before the real serial driver starts reconfiguring the serial
- controller (which would sometimes result in garbage being transmitted.)
- This change does not cause a visible performance loss.
-
- In addition, this seems to fix a hang observed in certain configurations on
- many AR7xxx/AR9xxx SoCs during autoconfig of the real serial driver.
-
- A more complete follow-up patch will disable 8250 autoconfig for ath79
- altogether (the serial controller is detected as a 16550A, which is not
- fully compatible with the ath79 serial, and the autoconfig may lead to
- undefined behavior on ath79.)
-
-diff --git a/target/linux/ar71xx/patches-3.18/103-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch b/target/linux/ar71xx/patches-3.18/103-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch
-new file mode 100644
-index 0000000..7be14ab
---- /dev/null
-+++ b/target/linux/ar71xx/patches-3.18/103-MIPS-ath79-make-bootconsole-wait-for-both-THRE-and-T.patch
-@@ -0,0 +1,54 @@
-+From f1ba020af5076172c9d29006a747ccf40027fedc Mon Sep 17 00:00:00 2001
-+Message-Id: <f1ba020af5076172c9d29006a747ccf40027fedc.1458840219.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Thu, 24 Mar 2016 15:34:05 +0100
-+Subject: [PATCH] MIPS: ath79: make bootconsole wait for both THRE and TEMT
-+
-+This makes the ath79 bootconsole behave the same way as the generic 8250
-+bootconsole.
-+
-+Also waiting for TEMT (transmit buffer is empty) instead of just THRE
-+(transmit buffer is not full) ensures that all characters have been
-+transmitted before the real serial driver starts reconfiguring the serial
-+controller (which would sometimes result in garbage being transmitted.)
-+This change does not cause a visible performance loss.
-+
-+In addition, this seems to fix a hang observed in certain configurations on
-+many AR7xxx/AR9xxx SoCs during autoconfig of the real serial driver.
-+
-+A more complete follow-up patch will disable 8250 autoconfig for ath79
-+altogether (the serial controller is detected as a 16550A, which is not
-+fully compatible with the ath79 serial, and the autoconfig may lead to
-+undefined behavior on ath79.)
-+
-+Cc: <stable@vger.kernel.org>
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+---
-+ arch/mips/ath79/early_printk.c | 6 ++++--
-+ 1 file changed, 4 insertions(+), 2 deletions(-)
-+
-+diff --git a/arch/mips/ath79/early_printk.c b/arch/mips/ath79/early_printk.c
-+index b955faf..d1adc59 100644
-+--- a/arch/mips/ath79/early_printk.c
-++++ b/arch/mips/ath79/early_printk.c
-+@@ -31,13 +31,15 @@ static inline void prom_putchar_wait(void __iomem *reg, u32 mask, u32 val)
-+ } while (1);
-+ }
-+
-++#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-++
-+ static void prom_putchar_ar71xx(unsigned char ch)
-+ {
-+ void __iomem *base = (void __iomem *)(KSEG1ADDR(AR71XX_UART_BASE));
-+
-+- prom_putchar_wait(base + UART_LSR * 4, UART_LSR_THRE, UART_LSR_THRE);
-++ prom_putchar_wait(base + UART_LSR * 4, BOTH_EMPTY, BOTH_EMPTY);
-+ __raw_writel(ch, base + UART_TX * 4);
-+- prom_putchar_wait(base + UART_LSR * 4, UART_LSR_THRE, UART_LSR_THRE);
-++ prom_putchar_wait(base + UART_LSR * 4, BOTH_EMPTY, BOTH_EMPTY);
-+ }
-+
-+ static void prom_putchar_ar933x(unsigned char ch)
-+--
-+2.7.4
-+
diff --git a/patches/openwrt/0020-generic-mtd-spi-nor-disable-protection-for-Winbond-flash-at-startup.patch b/patches/openwrt/0019-generic-mtd-spi-nor-disable-protection-for-Winbond-flash-at-startup.patch
similarity index 100%
rename from patches/openwrt/0020-generic-mtd-spi-nor-disable-protection-for-Winbond-flash-at-startup.patch
rename to patches/openwrt/0019-generic-mtd-spi-nor-disable-protection-for-Winbond-flash-at-startup.patch
diff --git a/patches/openwrt/0021-Support-LibreSSL-as-provider-of-openssl.patch b/patches/openwrt/0020-Support-LibreSSL-as-provider-of-openssl.patch
similarity index 100%
rename from patches/openwrt/0021-Support-LibreSSL-as-provider-of-openssl.patch
rename to patches/openwrt/0020-Support-LibreSSL-as-provider-of-openssl.patch
diff --git a/patches/openwrt/0022-ar71xx-check-both-HWID-and-HWREV-on-upgrades-of-TP-LINK-devices.patch b/patches/openwrt/0021-ar71xx-check-both-HWID-and-HWREV-on-upgrades-of-TP-LINK-devices.patch
similarity index 100%
rename from patches/openwrt/0022-ar71xx-check-both-HWID-and-HWREV-on-upgrades-of-TP-LINK-devices.patch
rename to patches/openwrt/0021-ar71xx-check-both-HWID-and-HWREV-on-upgrades-of-TP-LINK-devices.patch
diff --git a/patches/openwrt/0023-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch b/patches/openwrt/0022-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch
similarity index 100%
rename from patches/openwrt/0023-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch
rename to patches/openwrt/0022-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch
diff --git a/patches/openwrt/0024-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch b/patches/openwrt/0023-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch
similarity index 100%
rename from patches/openwrt/0024-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch
rename to patches/openwrt/0023-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch
diff --git a/patches/openwrt/0025-ar71xx-build-image-for-TL-WR710N-v2.1.patch b/patches/openwrt/0024-ar71xx-build-image-for-TL-WR710N-v2.1.patch
similarity index 100%
rename from patches/openwrt/0025-ar71xx-build-image-for-TL-WR710N-v2.1.patch
rename to patches/openwrt/0024-ar71xx-build-image-for-TL-WR710N-v2.1.patch
diff --git a/patches/openwrt/0026-xtables-addons-build-fix-configure-compatiblity-with-POSIX-shells.patch b/patches/openwrt/0025-xtables-addons-build-fix-configure-compatiblity-with-POSIX-shells.patch
similarity index 100%
rename from patches/openwrt/0026-xtables-addons-build-fix-configure-compatiblity-with-POSIX-shells.patch
rename to patches/openwrt/0025-xtables-addons-build-fix-configure-compatiblity-with-POSIX-shells.patch
diff --git a/patches/openwrt/0027-tools-add-tar-host-build-required-for-sort-name-which-was-only-added-in-the-latest-version.patch b/patches/openwrt/0026-tools-add-tar-host-build-required-for-sort-name-which-was-only-added-in-the-latest-version.patch
similarity index 100%
rename from patches/openwrt/0027-tools-add-tar-host-build-required-for-sort-name-which-was-only-added-in-the-latest-version.patch
rename to patches/openwrt/0026-tools-add-tar-host-build-required-for-sort-name-which-was-only-added-in-the-latest-version.patch
diff --git a/patches/openwrt/0028-tools-compile-flock-before-everything-else.patch b/patches/openwrt/0027-tools-compile-flock-before-everything-else.patch
similarity index 100%
rename from patches/openwrt/0028-tools-compile-flock-before-everything-else.patch
rename to patches/openwrt/0027-tools-compile-flock-before-everything-else.patch
diff --git a/patches/openwrt/0029-rules.mk-make-the-locked-template-available-even-if-flock-has-not-been-built-yet-fall-back-to-unlocked-shell-command.patch b/patches/openwrt/0028-rules.mk-make-the-locked-template-available-even-if-flock-has-not-been-built-yet-fall-back-to-unlocked-shell-command.patch
similarity index 100%
rename from patches/openwrt/0029-rules.mk-make-the-locked-template-available-even-if-flock-has-not-been-built-yet-fall-back-to-unlocked-shell-command.patch
rename to patches/openwrt/0028-rules.mk-make-the-locked-template-available-even-if-flock-has-not-been-built-yet-fall-back-to-unlocked-shell-command.patch
diff --git a/patches/openwrt/0030-build-add-locking-for-downloads-fixes-race-conditions-with-multiple-variants.patch b/patches/openwrt/0029-build-add-locking-for-downloads-fixes-race-conditions-with-multiple-variants.patch
similarity index 100%
rename from patches/openwrt/0030-build-add-locking-for-downloads-fixes-race-conditions-with-multiple-variants.patch
rename to patches/openwrt/0029-build-add-locking-for-downloads-fixes-race-conditions-with-multiple-variants.patch
diff --git a/patches/openwrt/0031-download.mk-fix-packed-checkout-mirroring-support.patch b/patches/openwrt/0030-download.mk-fix-packed-checkout-mirroring-support.patch
similarity index 100%
rename from patches/openwrt/0031-download.mk-fix-packed-checkout-mirroring-support.patch
rename to patches/openwrt/0030-download.mk-fix-packed-checkout-mirroring-support.patch