diff --git a/patches/openwrt/0006-build-add-support-for-choosing-a-different-url-filename-part-than-the-output-file.patch b/patches/openwrt/0006-build-add-support-for-choosing-a-different-url-filename-part-than-the-output-file.patch
new file mode 100644
index 0000000000000000000000000000000000000000..67564c8033b80b42bce8944be4a0b520f8f7f663
--- /dev/null
+++ b/patches/openwrt/0006-build-add-support-for-choosing-a-different-url-filename-part-than-the-output-file.patch
@@ -0,0 +1,68 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Tue, 9 Feb 2016 13:49:01 +0100
+Subject: build: add support for choosing a different url filename part than the output file
+
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
+Backport of r47591 and r48427
+
+diff --git a/include/download.mk b/include/download.mk
+index 937b5d3..e518cce 100644
+--- a/include/download.mk
++++ b/include/download.mk
+@@ -44,11 +44,11 @@ define DownloadMethod/unknown
+ endef
+
+ define DownloadMethod/default
+- $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MD5SUM)" $(foreach url,$(URL),"$(url)")
++ $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MD5SUM)" "$(URL_FILE)" $(foreach url,$(URL),"$(url)")
+ endef
+
+ define wrap_mirror
+- $(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" || ( $(1) ),$(1))
++ $(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" "" || ( $(1) ),$(1))
+ endef
+
+ define DownloadMethod/cvs
+@@ -157,6 +157,7 @@ Validate/darcs=VERSION SUBDIR
+ define Download/Defaults
+ URL:=
+ FILE:=
++ URL_FILE:=
+ PROTO:=
+ MD5SUM:=
+ SUBDIR:=
+diff --git a/scripts/download.pl b/scripts/download.pl
+index cd68a7b..111d03c 100755
+--- a/scripts/download.pl
++++ b/scripts/download.pl
+@@ -11,15 +11,19 @@ use warnings;
+ use File::Basename;
+ use File::Copy;
+
+-@ARGV > 2 or die "Syntax: $0 <target dir> <filename> <md5sum> [<mirror> ...]\n";
++@ARGV > 2 or die "Syntax: $0 <target dir> <filename> <md5sum> <url filename> [<mirror> ...]\n";
+
++my $url_filename;
+ my $target = shift @ARGV;
+ my $filename = shift @ARGV;
+ my $md5sum = shift @ARGV;
++$url_filename = shift @ARGV unless $ARGV[0] =~ /:\/\//;
+ my $scriptdir = dirname($0);
+ my @mirrors;
+ my $ok;
+
++$url_filename or $url_filename = $filename;
++
+ sub localmirrors {
+ my @mlist;
+ open LM, "$scriptdir/localmirrors" and do {
+@@ -106,7 +110,7 @@ sub download
+ return;
+ }
+ } else {
+- open WGET, "wget -t5 --timeout=20 --no-check-certificate $options -O- '$mirror/$filename' |" or die "Cannot launch wget.\n";
++ open WGET, "wget -t5 --timeout=20 --no-check-certificate $options -O- '$mirror/$url_filename' |" or die "Cannot launch wget.\n";
+ open MD5SUM, "| $md5cmd > '$target/$filename.md5sum'" or die "Cannot launch md5sum.\n";
+ open OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n";
+ my $buffer;
diff --git a/patches/openwrt/0006-mac80211-backport-from-trunk-r47249.patch b/patches/openwrt/0007-mac80211-backport-from-trunk-r47249.patch
similarity index 100%
rename from patches/openwrt/0006-mac80211-backport-from-trunk-r47249.patch
rename to patches/openwrt/0007-mac80211-backport-from-trunk-r47249.patch
diff --git a/patches/openwrt/0007-mac80211-ath10k-allow-simultaneous-AP-IBSS.patch b/patches/openwrt/0008-mac80211-ath10k-allow-simultaneous-AP-IBSS.patch
similarity index 100%
rename from patches/openwrt/0007-mac80211-ath10k-allow-simultaneous-AP-IBSS.patch
rename to patches/openwrt/0008-mac80211-ath10k-allow-simultaneous-AP-IBSS.patch
diff --git a/patches/openwrt/0008-iwinfo-update-NanoStation-Loco-txpower-offsets.patch b/patches/openwrt/0009-iwinfo-update-NanoStation-Loco-txpower-offsets.patch
similarity index 100%
rename from patches/openwrt/0008-iwinfo-update-NanoStation-Loco-txpower-offsets.patch
rename to patches/openwrt/0009-iwinfo-update-NanoStation-Loco-txpower-offsets.patch
diff --git a/patches/openwrt/0009-ar71xx-add-support-for-tp-link-wr740n-v5.0-EU.patch b/patches/openwrt/0010-ar71xx-add-support-for-tp-link-wr740n-v5.0-EU.patch
similarity index 100%
rename from patches/openwrt/0009-ar71xx-add-support-for-tp-link-wr740n-v5.0-EU.patch
rename to patches/openwrt/0010-ar71xx-add-support-for-tp-link-wr740n-v5.0-EU.patch
diff --git a/patches/openwrt/0010-ar71xx-add-support-for-TL-WR741ND-v5.patch b/patches/openwrt/0011-ar71xx-add-support-for-TL-WR741ND-v5.patch
similarity index 100%
rename from patches/openwrt/0010-ar71xx-add-support-for-TL-WR741ND-v5.patch
rename to patches/openwrt/0011-ar71xx-add-support-for-TL-WR741ND-v5.patch
diff --git a/patches/openwrt/0011-sunxi-fix-uboot-install-location.patch b/patches/openwrt/0012-sunxi-fix-uboot-install-location.patch
similarity index 100%
rename from patches/openwrt/0011-sunxi-fix-uboot-install-location.patch
rename to patches/openwrt/0012-sunxi-fix-uboot-install-location.patch
diff --git a/patches/openwrt/0012-sunxi-respect-CONFIG_TARGET_IMAGES_GZIP.patch b/patches/openwrt/0013-sunxi-respect-CONFIG_TARGET_IMAGES_GZIP.patch
similarity index 100%
rename from patches/openwrt/0012-sunxi-respect-CONFIG_TARGET_IMAGES_GZIP.patch
rename to patches/openwrt/0013-sunxi-respect-CONFIG_TARGET_IMAGES_GZIP.patch
diff --git a/patches/openwrt/0013-odhcp6c-add-option-sourcefilter-to-disable-source-filter.patch b/patches/openwrt/0014-odhcp6c-add-option-sourcefilter-to-disable-source-filter.patch
similarity index 100%
rename from patches/openwrt/0013-odhcp6c-add-option-sourcefilter-to-disable-source-filter.patch
rename to patches/openwrt/0014-odhcp6c-add-option-sourcefilter-to-disable-source-filter.patch
diff --git a/patches/openwrt/0014-mac80211-set-mcast-rate-for-mesh-point-interfaces.patch b/patches/openwrt/0015-mac80211-set-mcast-rate-for-mesh-point-interfaces.patch
similarity index 100%
rename from patches/openwrt/0014-mac80211-set-mcast-rate-for-mesh-point-interfaces.patch
rename to patches/openwrt/0015-mac80211-set-mcast-rate-for-mesh-point-interfaces.patch
diff --git a/patches/openwrt/0015-hostapd-prevent-channel-switch-for-5GHz.patch b/patches/openwrt/0016-hostapd-prevent-channel-switch-for-5GHz.patch
similarity index 100%
rename from patches/openwrt/0015-hostapd-prevent-channel-switch-for-5GHz.patch
rename to patches/openwrt/0016-hostapd-prevent-channel-switch-for-5GHz.patch
diff --git a/patches/openwrt/0016-ar71xx-fix-ethernet-initialization-on-QCA953x-based-boards-TP-Link-TL-WR841N-ND-v9-Compex-WPJ531.patch b/patches/openwrt/0017-ar71xx-fix-ethernet-initialization-on-QCA953x-based-boards-TP-Link-TL-WR841N-ND-v9-Compex-WPJ531.patch
similarity index 100%
rename from patches/openwrt/0016-ar71xx-fix-ethernet-initialization-on-QCA953x-based-boards-TP-Link-TL-WR841N-ND-v9-Compex-WPJ531.patch
rename to patches/openwrt/0017-ar71xx-fix-ethernet-initialization-on-QCA953x-based-boards-TP-Link-TL-WR841N-ND-v9-Compex-WPJ531.patch
diff --git a/patches/openwrt/0017-ar71xx-rework-patch-for-qca953x-956x.patch b/patches/openwrt/0018-ar71xx-rework-patch-for-qca953x-956x.patch
similarity index 100%
rename from patches/openwrt/0017-ar71xx-rework-patch-for-qca953x-956x.patch
rename to patches/openwrt/0018-ar71xx-rework-patch-for-qca953x-956x.patch
diff --git a/patches/openwrt/0018-base-files-default_postinst-propagate-the-real-postinst-return-code.patch b/patches/openwrt/0019-base-files-default_postinst-propagate-the-real-postinst-return-code.patch
similarity index 100%
rename from patches/openwrt/0018-base-files-default_postinst-propagate-the-real-postinst-return-code.patch
rename to patches/openwrt/0019-base-files-default_postinst-propagate-the-real-postinst-return-code.patch
diff --git a/patches/openwrt/0019-opkg-work-around-unconditional-libopenssl-build-dependency.patch b/patches/openwrt/0020-opkg-work-around-unconditional-libopenssl-build-dependency.patch
similarity index 100%
rename from patches/openwrt/0019-opkg-work-around-unconditional-libopenssl-build-dependency.patch
rename to patches/openwrt/0020-opkg-work-around-unconditional-libopenssl-build-dependency.patch
diff --git a/patches/openwrt/0020-hostapd-work-around-unconditional-libopenssl-build-dependency.patch b/patches/openwrt/0021-hostapd-work-around-unconditional-libopenssl-build-dependency.patch
similarity index 100%
rename from patches/openwrt/0020-hostapd-work-around-unconditional-libopenssl-build-dependency.patch
rename to patches/openwrt/0021-hostapd-work-around-unconditional-libopenssl-build-dependency.patch
diff --git a/patches/openwrt/0021-odhcp6c-minor-fixes.patch b/patches/openwrt/0022-odhcp6c-minor-fixes.patch
similarity index 100%
rename from patches/openwrt/0021-odhcp6c-minor-fixes.patch
rename to patches/openwrt/0022-odhcp6c-minor-fixes.patch
diff --git a/patches/openwrt/0022-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch b/patches/openwrt/0023-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch
similarity index 100%
rename from patches/openwrt/0022-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch
rename to patches/openwrt/0023-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch
diff --git a/patches/openwrt/0023-base-files-add-etc-profile.d-support.patch b/patches/openwrt/0024-base-files-add-etc-profile.d-support.patch
similarity index 100%
rename from patches/openwrt/0023-base-files-add-etc-profile.d-support.patch
rename to patches/openwrt/0024-base-files-add-etc-profile.d-support.patch
diff --git a/patches/openwrt/0024-Kernel-Realtek-8150-and-Realtek-8152-based-USB-to-Ethernet-converters.patch b/patches/openwrt/0025-Kernel-Realtek-8150-and-Realtek-8152-based-USB-to-Ethernet-converters.patch
similarity index 100%
rename from patches/openwrt/0024-Kernel-Realtek-8150-and-Realtek-8152-based-USB-to-Ethernet-converters.patch
rename to patches/openwrt/0025-Kernel-Realtek-8150-and-Realtek-8152-based-USB-to-Ethernet-converters.patch
diff --git a/patches/openwrt/0025-tools-firmware-utils-tplink-safeloader-clean-up-code.patch b/patches/openwrt/0026-tools-firmware-utils-tplink-safeloader-clean-up-code.patch
similarity index 100%
rename from patches/openwrt/0025-tools-firmware-utils-tplink-safeloader-clean-up-code.patch
rename to patches/openwrt/0026-tools-firmware-utils-tplink-safeloader-clean-up-code.patch
diff --git a/patches/openwrt/0026-tools-firmware-utils-tplink-safeloader-fix-support-list-format-clean-up-vendor-information.patch b/patches/openwrt/0027-tools-firmware-utils-tplink-safeloader-fix-support-list-format-clean-up-vendor-information.patch
similarity index 100%
rename from patches/openwrt/0026-tools-firmware-utils-tplink-safeloader-fix-support-list-format-clean-up-vendor-information.patch
rename to patches/openwrt/0027-tools-firmware-utils-tplink-safeloader-fix-support-list-format-clean-up-vendor-information.patch
diff --git a/patches/openwrt/0027-tools-firmware-utils-tplink-safeloader-add-version-1.1-support-to-CPE210-220-510-520.patch b/patches/openwrt/0028-tools-firmware-utils-tplink-safeloader-add-version-1.1-support-to-CPE210-220-510-520.patch
similarity index 100%
rename from patches/openwrt/0027-tools-firmware-utils-tplink-safeloader-add-version-1.1-support-to-CPE210-220-510-520.patch
rename to patches/openwrt/0028-tools-firmware-utils-tplink-safeloader-add-version-1.1-support-to-CPE210-220-510-520.patch
diff --git a/patches/openwrt/0028-ipv6-fix-crash-on-ICMPv6-redirects-with-prohibited-blackholed-source.patch b/patches/openwrt/0029-ipv6-fix-crash-on-ICMPv6-redirects-with-prohibited-blackholed-source.patch
similarity index 100%
rename from patches/openwrt/0028-ipv6-fix-crash-on-ICMPv6-redirects-with-prohibited-blackholed-source.patch
rename to patches/openwrt/0029-ipv6-fix-crash-on-ICMPv6-redirects-with-prohibited-blackholed-source.patch
diff --git a/patches/openwrt/0029-mac80211-fix-crash-when-using-mesh-11s-VIF-together-with-another-VIF.patch b/patches/openwrt/0030-mac80211-fix-crash-when-using-mesh-11s-VIF-together-with-another-VIF.patch
similarity index 100%
rename from patches/openwrt/0029-mac80211-fix-crash-when-using-mesh-11s-VIF-together-with-another-VIF.patch
rename to patches/openwrt/0030-mac80211-fix-crash-when-using-mesh-11s-VIF-together-with-another-VIF.patch
diff --git a/patches/openwrt/0030-ath10k-add-Candelatech-community-firmware-as-an-additional-choice.patch b/patches/openwrt/0031-ath10k-add-Candelatech-community-firmware-as-an-additional-choice.patch
similarity index 100%
rename from patches/openwrt/0030-ath10k-add-Candelatech-community-firmware-as-an-additional-choice.patch
rename to patches/openwrt/0031-ath10k-add-Candelatech-community-firmware-as-an-additional-choice.patch
diff --git a/patches/openwrt/0031-mac80211-ath9k-add-correct-MAC-BB-name-for-ar9561.patch b/patches/openwrt/0032-mac80211-ath9k-add-correct-MAC-BB-name-for-ar9561.patch
similarity index 100%
rename from patches/openwrt/0031-mac80211-ath9k-add-correct-MAC-BB-name-for-ar9561.patch
rename to patches/openwrt/0032-mac80211-ath9k-add-correct-MAC-BB-name-for-ar9561.patch
diff --git a/patches/openwrt/0032-ar71xx-add-support-for-TP-LINK-TL-WR941ND-v6-international-version.patch b/patches/openwrt/0033-ar71xx-add-support-for-TP-LINK-TL-WR941ND-v6-international-version.patch
similarity index 100%
rename from patches/openwrt/0032-ar71xx-add-support-for-TP-LINK-TL-WR941ND-v6-international-version.patch
rename to patches/openwrt/0033-ar71xx-add-support-for-TP-LINK-TL-WR941ND-v6-international-version.patch
diff --git a/patches/openwrt/0033-ar71xx-add-support-for-TP-Link-TL-WR1043ND-v3.patch b/patches/openwrt/0034-ar71xx-add-support-for-TP-Link-TL-WR1043ND-v3.patch
similarity index 100%
rename from patches/openwrt/0033-ar71xx-add-support-for-TP-Link-TL-WR1043ND-v3.patch
rename to patches/openwrt/0034-ar71xx-add-support-for-TP-Link-TL-WR1043ND-v3.patch
diff --git a/patches/openwrt/0034-ar71xx-backport-ath10k-calibration-data-load-changes.patch b/patches/openwrt/0035-ar71xx-backport-ath10k-calibration-data-load-changes.patch
similarity index 100%
rename from patches/openwrt/0034-ar71xx-backport-ath10k-calibration-data-load-changes.patch
rename to patches/openwrt/0035-ar71xx-backport-ath10k-calibration-data-load-changes.patch
diff --git a/patches/openwrt/0035-ar71xx-fix-AR71XX_MODEL-on-TP-Link-TL-WR703N.patch b/patches/openwrt/0036-ar71xx-fix-AR71XX_MODEL-on-TP-Link-TL-WR703N.patch
similarity index 100%
rename from patches/openwrt/0035-ar71xx-fix-AR71XX_MODEL-on-TP-Link-TL-WR703N.patch
rename to patches/openwrt/0036-ar71xx-fix-AR71XX_MODEL-on-TP-Link-TL-WR703N.patch
diff --git a/patches/openwrt/0036-acx-mac80211-mark-as-BROKEN-to-avoid-compile-failure-on-mipsel-targets.patch b/patches/openwrt/0037-acx-mac80211-mark-as-BROKEN-to-avoid-compile-failure-on-mipsel-targets.patch
similarity index 100%
rename from patches/openwrt/0036-acx-mac80211-mark-as-BROKEN-to-avoid-compile-failure-on-mipsel-targets.patch
rename to patches/openwrt/0037-acx-mac80211-mark-as-BROKEN-to-avoid-compile-failure-on-mipsel-targets.patch
diff --git a/patches/openwrt/0037-OpenSSL-Added-source-old-to-PKG_SOURCE_URL.patch b/patches/openwrt/0038-OpenSSL-Added-source-old-to-PKG_SOURCE_URL.patch
similarity index 100%
rename from patches/openwrt/0037-OpenSSL-Added-source-old-to-PKG_SOURCE_URL.patch
rename to patches/openwrt/0038-OpenSSL-Added-source-old-to-PKG_SOURCE_URL.patch
diff --git a/patches/openwrt/0038-lua-fix-installation-of-headers-for-host-build.patch b/patches/openwrt/0039-lua-fix-installation-of-headers-for-host-build.patch
similarity index 100%
rename from patches/openwrt/0038-lua-fix-installation-of-headers-for-host-build.patch
rename to patches/openwrt/0039-lua-fix-installation-of-headers-for-host-build.patch
diff --git a/patches/openwrt/0039-kernel-fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes.patch b/patches/openwrt/0040-kernel-fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes.patch
similarity index 100%
rename from patches/openwrt/0039-kernel-fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes.patch
rename to patches/openwrt/0040-kernel-fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes.patch
diff --git a/patches/openwrt/0040-x86-generic-refresh-kernel-config.patch b/patches/openwrt/0041-x86-generic-refresh-kernel-config.patch
similarity index 100%
rename from patches/openwrt/0040-x86-generic-refresh-kernel-config.patch
rename to patches/openwrt/0041-x86-generic-refresh-kernel-config.patch
diff --git a/patches/openwrt/0041-x86-generic-enable-pata_atiixp-driver.patch b/patches/openwrt/0042-x86-generic-enable-pata_atiixp-driver.patch
similarity index 100%
rename from patches/openwrt/0041-x86-generic-enable-pata_atiixp-driver.patch
rename to patches/openwrt/0042-x86-generic-enable-pata_atiixp-driver.patch