diff --git a/patches/lede/0031-Revert-scripts-package-metadata.pl-inhibit-compile-deps-on-missing-build-types.patch b/patches/lede/0030-Revert-scripts-package-metadata.pl-inhibit-compile-deps-on-missing-build-types.patch
similarity index 100%
rename from patches/lede/0031-Revert-scripts-package-metadata.pl-inhibit-compile-deps-on-missing-build-types.patch
rename to patches/lede/0030-Revert-scripts-package-metadata.pl-inhibit-compile-deps-on-missing-build-types.patch
diff --git a/patches/lede/0030-busybox-compile-with-debug-information.patch b/patches/lede/0030-busybox-compile-with-debug-information.patch
deleted file mode 100644
index 02a5596bbd76f7716596e80ce75c90acb4ad5ca3..0000000000000000000000000000000000000000
--- a/patches/lede/0030-busybox-compile-with-debug-information.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 3 Jul 2017 01:40:32 +0200
-Subject: busybox: compile with debug information
-
-The added debug information is stripped of during packaging, so it does not
-increase the package size. It does however slightly change offsets in the
-code, preventing the weird ash segfaults we've been seeing. Also, if the
-issue returns, we'll have debug information matching the coredumps.
-
-diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
-index 0d370863653e280165c8083061799af97d031169..5d73e817b3c67225bd3fb4e5b7d86e290db7397b 100644
---- a/package/utils/busybox/Makefile
-+++ b/package/utils/busybox/Makefile
-@@ -91,6 +91,8 @@ ifdef CONFIG_BUSYBOX_DEFAULT_NSLOOKUP_LEDE
-   endif
- endif
- 
-+TARGET_CFLAGS += -g
-+
- define Build/Compile
- 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
- 		CC="$(TARGET_CC)" \
diff --git a/patches/lede/0032-scripts-metadata-always-resolve-dependencies-through-provides-list.patch b/patches/lede/0031-scripts-metadata-always-resolve-dependencies-through-provides-list.patch
similarity index 100%
rename from patches/lede/0032-scripts-metadata-always-resolve-dependencies-through-provides-list.patch
rename to patches/lede/0031-scripts-metadata-always-resolve-dependencies-through-provides-list.patch
diff --git a/patches/lede/0033-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch b/patches/lede/0032-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch
similarity index 100%
rename from patches/lede/0033-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch
rename to patches/lede/0032-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch
diff --git a/patches/lede/0034-base-files-upgrade-don-t-loop-forever-trying-to-kill-processes.patch b/patches/lede/0033-base-files-upgrade-don-t-loop-forever-trying-to-kill-processes.patch
similarity index 100%
rename from patches/lede/0034-base-files-upgrade-don-t-loop-forever-trying-to-kill-processes.patch
rename to patches/lede/0033-base-files-upgrade-don-t-loop-forever-trying-to-kill-processes.patch
diff --git a/patches/lede/0035-bcm53xx-upgrade-fix-RAMFS_COPY_.patch b/patches/lede/0034-bcm53xx-upgrade-fix-RAMFS_COPY_.patch
similarity index 100%
rename from patches/lede/0035-bcm53xx-upgrade-fix-RAMFS_COPY_.patch
rename to patches/lede/0034-bcm53xx-upgrade-fix-RAMFS_COPY_.patch
diff --git a/patches/lede/0036-ipq806x-upgrade-fix-RAMFS_COPY_.patch b/patches/lede/0035-ipq806x-upgrade-fix-RAMFS_COPY_.patch
similarity index 100%
rename from patches/lede/0036-ipq806x-upgrade-fix-RAMFS_COPY_.patch
rename to patches/lede/0035-ipq806x-upgrade-fix-RAMFS_COPY_.patch
diff --git a/patches/lede/0037-kirkwood-upgrade-fix-RAMFS_COPY_.patch b/patches/lede/0036-kirkwood-upgrade-fix-RAMFS_COPY_.patch
similarity index 100%
rename from patches/lede/0037-kirkwood-upgrade-fix-RAMFS_COPY_.patch
rename to patches/lede/0036-kirkwood-upgrade-fix-RAMFS_COPY_.patch
diff --git a/patches/lede/0038-ar71xx-add-uImageArcher-to-tp-link.mk.patch b/patches/lede/0037-ar71xx-add-uImageArcher-to-tp-link.mk.patch
similarity index 100%
rename from patches/lede/0038-ar71xx-add-uImageArcher-to-tp-link.mk.patch
rename to patches/lede/0037-ar71xx-add-uImageArcher-to-tp-link.mk.patch
diff --git a/patches/lede/0039-ar71xx-add-support-for-TP-Link-Archer-C25-v1.patch b/patches/lede/0038-ar71xx-add-support-for-TP-Link-Archer-C25-v1.patch
similarity index 100%
rename from patches/lede/0039-ar71xx-add-support-for-TP-Link-Archer-C25-v1.patch
rename to patches/lede/0038-ar71xx-add-support-for-TP-Link-Archer-C25-v1.patch
diff --git a/patches/lede/0040-firmware-utils-tplink-safeloader-add-TP-Link-Archer-C25-v1.patch b/patches/lede/0039-firmware-utils-tplink-safeloader-add-TP-Link-Archer-C25-v1.patch
similarity index 100%
rename from patches/lede/0040-firmware-utils-tplink-safeloader-add-TP-Link-Archer-C25-v1.patch
rename to patches/lede/0039-firmware-utils-tplink-safeloader-add-TP-Link-Archer-C25-v1.patch
diff --git a/patches/lede/0041-firmware-utils-tplink-safeloader-support-strings-as-soft_version.patch b/patches/lede/0040-firmware-utils-tplink-safeloader-support-strings-as-soft_version.patch
similarity index 100%
rename from patches/lede/0041-firmware-utils-tplink-safeloader-support-strings-as-soft_version.patch
rename to patches/lede/0040-firmware-utils-tplink-safeloader-support-strings-as-soft_version.patch
diff --git a/patches/lede/0042-add-CONFIG_GPIO_74X164-and-CONFIG_SPI_GPIO-for-Archer-C25.patch b/patches/lede/0041-add-CONFIG_GPIO_74X164-and-CONFIG_SPI_GPIO-for-Archer-C25.patch
similarity index 100%
rename from patches/lede/0042-add-CONFIG_GPIO_74X164-and-CONFIG_SPI_GPIO-for-Archer-C25.patch
rename to patches/lede/0041-add-CONFIG_GPIO_74X164-and-CONFIG_SPI_GPIO-for-Archer-C25.patch
diff --git a/patches/lede/0043-ramips-use-GPIO_ACTIVE-macros-in-UBNT-ERX.dts.patch b/patches/lede/0042-ramips-use-GPIO_ACTIVE-macros-in-UBNT-ERX.dts.patch
similarity index 100%
rename from patches/lede/0043-ramips-use-GPIO_ACTIVE-macros-in-UBNT-ERX.dts.patch
rename to patches/lede/0042-ramips-use-GPIO_ACTIVE-macros-in-UBNT-ERX.dts.patch
diff --git a/patches/lede/0044-ramips-add-support-for-Ubiquiti-EdgeRouter-X-SFP.patch b/patches/lede/0043-ramips-add-support-for-Ubiquiti-EdgeRouter-X-SFP.patch
similarity index 100%
rename from patches/lede/0044-ramips-add-support-for-Ubiquiti-EdgeRouter-X-SFP.patch
rename to patches/lede/0043-ramips-add-support-for-Ubiquiti-EdgeRouter-X-SFP.patch
diff --git a/patches/lede/0045-ar71xx-add-support-for-TP-Link-TL-WR1043N-v5.patch b/patches/lede/0044-ar71xx-add-support-for-TP-Link-TL-WR1043N-v5.patch
similarity index 100%
rename from patches/lede/0045-ar71xx-add-support-for-TP-Link-TL-WR1043N-v5.patch
rename to patches/lede/0044-ar71xx-add-support-for-TP-Link-TL-WR1043N-v5.patch
diff --git a/patches/lede/0046-ar71xx-add-support-for-TP-LINK-Archer-C7-v4.patch b/patches/lede/0045-ar71xx-add-support-for-TP-LINK-Archer-C7-v4.patch
similarity index 100%
rename from patches/lede/0046-ar71xx-add-support-for-TP-LINK-Archer-C7-v4.patch
rename to patches/lede/0045-ar71xx-add-support-for-TP-LINK-Archer-C7-v4.patch
diff --git a/patches/lede/0047-ar71xx-fix-TP-Link-Archer-C7-v4-switch-LEDs.patch b/patches/lede/0046-ar71xx-fix-TP-Link-Archer-C7-v4-switch-LEDs.patch
similarity index 100%
rename from patches/lede/0047-ar71xx-fix-TP-Link-Archer-C7-v4-switch-LEDs.patch
rename to patches/lede/0046-ar71xx-fix-TP-Link-Archer-C7-v4-switch-LEDs.patch
diff --git a/patches/lede/0048-ar71xx-fix-Archer-C7-5GHz-MAC-address.patch b/patches/lede/0047-ar71xx-fix-Archer-C7-5GHz-MAC-address.patch
similarity index 100%
rename from patches/lede/0048-ar71xx-fix-Archer-C7-5GHz-MAC-address.patch
rename to patches/lede/0047-ar71xx-fix-Archer-C7-5GHz-MAC-address.patch
diff --git a/patches/lede/0049-ebtables-Use-flock-for-concurrent-option.patch b/patches/lede/0048-ebtables-Use-flock-for-concurrent-option.patch
similarity index 100%
rename from patches/lede/0049-ebtables-Use-flock-for-concurrent-option.patch
rename to patches/lede/0048-ebtables-Use-flock-for-concurrent-option.patch
diff --git a/patches/lede/0050-ar71xx-add-support-to-TP-Link-Archer-C59v1-and-C60v1.patch b/patches/lede/0049-ar71xx-add-support-to-TP-Link-Archer-C59v1-and-C60v1.patch
similarity index 100%
rename from patches/lede/0050-ar71xx-add-support-to-TP-Link-Archer-C59v1-and-C60v1.patch
rename to patches/lede/0049-ar71xx-add-support-to-TP-Link-Archer-C59v1-and-C60v1.patch
diff --git a/patches/lede/0051-ar71xx-fix-lan-ports-on-archer-C59-and-C60.patch b/patches/lede/0050-ar71xx-fix-lan-ports-on-archer-C59-and-C60.patch
similarity index 100%
rename from patches/lede/0051-ar71xx-fix-lan-ports-on-archer-C59-and-C60.patch
rename to patches/lede/0050-ar71xx-fix-lan-ports-on-archer-C59-and-C60.patch
diff --git a/patches/lede/0052-ar71xx-add-support-for-TP-Link-Archer-C58-v1.patch b/patches/lede/0051-ar71xx-add-support-for-TP-Link-Archer-C58-v1.patch
similarity index 100%
rename from patches/lede/0052-ar71xx-add-support-for-TP-Link-Archer-C58-v1.patch
rename to patches/lede/0051-ar71xx-add-support-for-TP-Link-Archer-C58-v1.patch
diff --git a/patches/lede/0053-ath10k-firmware-update-repository.patch b/patches/lede/0052-ath10k-firmware-update-repository.patch
similarity index 100%
rename from patches/lede/0053-ath10k-firmware-update-repository.patch
rename to patches/lede/0052-ath10k-firmware-update-repository.patch
diff --git a/patches/lede/0054-ath10k-firmware-add-qca9888-firmware.patch b/patches/lede/0053-ath10k-firmware-add-qca9888-firmware.patch
similarity index 100%
rename from patches/lede/0054-ath10k-firmware-add-qca9888-firmware.patch
rename to patches/lede/0053-ath10k-firmware-add-qca9888-firmware.patch
diff --git a/patches/lede/0055-ar71xx-fix-board.bin-used-by-QCA9886-in-Archer-C58-C59-C60.patch b/patches/lede/0054-ar71xx-fix-board.bin-used-by-QCA9886-in-Archer-C58-C59-C60.patch
similarity index 100%
rename from patches/lede/0055-ar71xx-fix-board.bin-used-by-QCA9886-in-Archer-C58-C59-C60.patch
rename to patches/lede/0054-ar71xx-fix-board.bin-used-by-QCA9886-in-Archer-C58-C59-C60.patch
diff --git a/patches/lede/0056-ar71xx-Archer-C58-C59-C60-fix-qca9886-wireless-interface.patch b/patches/lede/0055-ar71xx-Archer-C58-C59-C60-fix-qca9886-wireless-interface.patch
similarity index 100%
rename from patches/lede/0056-ar71xx-Archer-C58-C59-C60-fix-qca9886-wireless-interface.patch
rename to patches/lede/0055-ar71xx-Archer-C58-C59-C60-fix-qca9886-wireless-interface.patch
diff --git a/patches/lede/0057-ath10k-firmware-qca9888-firmware-remove-board.bin.patch b/patches/lede/0056-ath10k-firmware-qca9888-firmware-remove-board.bin.patch
similarity index 100%
rename from patches/lede/0057-ath10k-firmware-qca9888-firmware-remove-board.bin.patch
rename to patches/lede/0056-ath10k-firmware-qca9888-firmware-remove-board.bin.patch
diff --git a/patches/lede/0058-ar71xx-C58-C59-fix-LAN1-working-incorrectly.patch b/patches/lede/0057-ar71xx-C58-C59-fix-LAN1-working-incorrectly.patch
similarity index 100%
rename from patches/lede/0058-ar71xx-C58-C59-fix-LAN1-working-incorrectly.patch
rename to patches/lede/0057-ar71xx-C58-C59-fix-LAN1-working-incorrectly.patch
diff --git a/patches/lede/0059-ar71xx-omit-VLAN-from-Archer-C58-C59-LAN-interface.patch b/patches/lede/0058-ar71xx-omit-VLAN-from-Archer-C58-C59-LAN-interface.patch
similarity index 100%
rename from patches/lede/0059-ar71xx-omit-VLAN-from-Archer-C58-C59-LAN-interface.patch
rename to patches/lede/0058-ar71xx-omit-VLAN-from-Archer-C58-C59-LAN-interface.patch
diff --git a/patches/lede/0060-ar71xx-increase-kernel-partition-size-for-some-TP-Link-boards.patch b/patches/lede/0059-ar71xx-increase-kernel-partition-size-for-some-TP-Link-boards.patch
similarity index 100%
rename from patches/lede/0060-ar71xx-increase-kernel-partition-size-for-some-TP-Link-boards.patch
rename to patches/lede/0059-ar71xx-increase-kernel-partition-size-for-some-TP-Link-boards.patch
diff --git a/patches/lede/0061-ar71xx-add-unaligned-access-hacks-for-VXLAN.patch b/patches/lede/0060-ar71xx-add-unaligned-access-hacks-for-VXLAN.patch
similarity index 100%
rename from patches/lede/0061-ar71xx-add-unaligned-access-hacks-for-VXLAN.patch
rename to patches/lede/0060-ar71xx-add-unaligned-access-hacks-for-VXLAN.patch
diff --git a/patches/lede/0062-netifd-system-linux-VXLAN-add-options-to-enable-and-disable-UDP-checksums.patch b/patches/lede/0061-netifd-system-linux-VXLAN-add-options-to-enable-and-disable-UDP-checksums.patch
similarity index 100%
rename from patches/lede/0062-netifd-system-linux-VXLAN-add-options-to-enable-and-disable-UDP-checksums.patch
rename to patches/lede/0061-netifd-system-linux-VXLAN-add-options-to-enable-and-disable-UDP-checksums.patch
diff --git a/patches/lede/0063-vxlan-add-options-to-enable-and-disable-UDP-checksums.patch b/patches/lede/0062-vxlan-add-options-to-enable-and-disable-UDP-checksums.patch
similarity index 100%
rename from patches/lede/0063-vxlan-add-options-to-enable-and-disable-UDP-checksums.patch
rename to patches/lede/0062-vxlan-add-options-to-enable-and-disable-UDP-checksums.patch
diff --git a/patches/lede/0064-ramips-mtd-spi-nor-add-support-for-switching-between-3-byte-and-4-byte-addressing-on-w25q256-flash.patch b/patches/lede/0063-ramips-mtd-spi-nor-add-support-for-switching-between-3-byte-and-4-byte-addressing-on-w25q256-flash.patch
similarity index 100%
rename from patches/lede/0064-ramips-mtd-spi-nor-add-support-for-switching-between-3-byte-and-4-byte-addressing-on-w25q256-flash.patch
rename to patches/lede/0063-ramips-mtd-spi-nor-add-support-for-switching-between-3-byte-and-4-byte-addressing-on-w25q256-flash.patch
diff --git a/patches/lede/0065-ramips-prepare-ZBT-WG3526-for-hardware-variants.patch b/patches/lede/0064-ramips-prepare-ZBT-WG3526-for-hardware-variants.patch
similarity index 100%
rename from patches/lede/0065-ramips-prepare-ZBT-WG3526-for-hardware-variants.patch
rename to patches/lede/0064-ramips-prepare-ZBT-WG3526-for-hardware-variants.patch
diff --git a/patches/lede/0066-ramips-rename-Digineo-AC1200-Pro-to-ZBT-WG3526-32MB.patch b/patches/lede/0065-ramips-rename-Digineo-AC1200-Pro-to-ZBT-WG3526-32MB.patch
similarity index 100%
rename from patches/lede/0066-ramips-rename-Digineo-AC1200-Pro-to-ZBT-WG3526-32MB.patch
rename to patches/lede/0065-ramips-rename-Digineo-AC1200-Pro-to-ZBT-WG3526-32MB.patch
diff --git a/patches/lede/0067-kernel-bridge-ebtables-Avoid-resetting-limit-rule-state.patch b/patches/lede/0066-kernel-bridge-ebtables-Avoid-resetting-limit-rule-state.patch
similarity index 100%
rename from patches/lede/0067-kernel-bridge-ebtables-Avoid-resetting-limit-rule-state.patch
rename to patches/lede/0066-kernel-bridge-ebtables-Avoid-resetting-limit-rule-state.patch