diff --git a/Makefile b/Makefile
index 30c0e06f0ee483d7f158f52d4141ceef543132c7..46736ab7d93150bb1c7b383710737fee5ab7dbdd 100644
--- a/Makefile
+++ b/Makefile
@@ -148,6 +148,7 @@ gluon_prepared_stamp := $(BOARD_BUILDDIR)/prepared
 include $(INCLUDE_DIR)/target.mk
 
 
+package/lua/host/install: tools/sed/install
 gluon-tools: package/lua/host/install
 
 prepare-tmpinfo: FORCE
diff --git a/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch b/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c5a4ee1c0d2a1ba50a800208ed2ddc750a5ed252
--- /dev/null
+++ b/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch
@@ -0,0 +1,62 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Wed, 7 May 2014 22:57:10 +0200
+Subject: tools/Makefile: fix host tools build dependencies
+
+diff --git a/tools/Makefile b/tools/Makefile
+index 2236373..1f45367 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -74,6 +74,7 @@ endif
+ $(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-)
+ $(curdir)/builddirs-default := $(tools-y)
+ 
++
+ ifndef DUMP_TARGET_DB
+ define PrepareStaging
+ 	@for dir in $(1); do ( \
+@@ -85,10 +86,16 @@ define PrepareStaging
+ endef
+ 
+ # preparatory work
++ifneq ($(ARCH),)
++staging_prepared = $(STAGING_DIR)/.prepared
++
+ $(STAGING_DIR)/.prepared: $(TMP_DIR)/.build
+ 	$(call PrepareStaging,$(STAGING_DIR))
+ 	mkdir -p $(BUILD_DIR)/stamp
+ 	touch $@
++else
++staging_prepared :=
++endif
+ 
+ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
+ 	$(call PrepareStaging,$(STAGING_DIR_HOST))
+@@ -100,7 +107,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
+ 
+ 
+ define PrepareCommand
+-$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
++$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR_HOST)/.prepared
+ 	@mkdir -p "$$(dir $$@)"; rm -f "$$@"
+ 	@export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \
+ 		echo "Command $(1) not found."; false; \
+@@ -109,7 +116,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
+ endef
+ endif
+ 
+-$(STAGING_DIR_HOST)/bin/stat: $(STAGING_DIR)/.prepared
++$(STAGING_DIR_HOST)/bin/stat: $(STAGING_DIR_HOST)/.prepared
+ 	@rm -f $@
+ 	@if stat --version > /dev/null 2>&1; then \
+ 		ln -s `which stat` $@; \
+@@ -127,8 +134,8 @@ $(eval $(call PrepareCommand,seq,gseq seq))
+ $(eval $(call PrepareCommand,python,python2 python))
+ 
+ $(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum cp stat seq python)
+-$(curdir)//prepare = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps)
+-$(curdir)//compile = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps)
++$(curdir)//prepare = $(staging_prepared) $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps)
++$(curdir)//compile = $(staging_prepared) $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps)
+ 
+ # prerequisites for the individual targets
+ $(curdir)/ := .config prereq
diff --git a/patches/openwrt/0001-Make-Unifi-images-flashable.patch b/patches/openwrt/0002-Make-Unifi-images-flashable.patch
similarity index 100%
rename from patches/openwrt/0001-Make-Unifi-images-flashable.patch
rename to patches/openwrt/0002-Make-Unifi-images-flashable.patch
diff --git a/patches/openwrt/0002-Update-netifd-and-its-dependencies-from-Barrier-Breaker.patch b/patches/openwrt/0003-Update-netifd-and-its-dependencies-from-Barrier-Breaker.patch
similarity index 100%
rename from patches/openwrt/0002-Update-netifd-and-its-dependencies-from-Barrier-Breaker.patch
rename to patches/openwrt/0003-Update-netifd-and-its-dependencies-from-Barrier-Breaker.patch
diff --git a/patches/openwrt/0003-Update-odhcp6c-from-Barrier-Breaker.patch b/patches/openwrt/0004-Update-odhcp6c-from-Barrier-Breaker.patch
similarity index 100%
rename from patches/openwrt/0003-Update-odhcp6c-from-Barrier-Breaker.patch
rename to patches/openwrt/0004-Update-odhcp6c-from-Barrier-Breaker.patch
diff --git a/patches/openwrt/0004-package-base-files-change-sysctl-handling.patch b/patches/openwrt/0005-package-base-files-change-sysctl-handling.patch
similarity index 100%
rename from patches/openwrt/0004-package-base-files-change-sysctl-handling.patch
rename to patches/openwrt/0005-package-base-files-change-sysctl-handling.patch
diff --git a/patches/openwrt/0005-Fix-ping6-sender-address.patch b/patches/openwrt/0006-Fix-ping6-sender-address.patch
similarity index 100%
rename from patches/openwrt/0005-Fix-ping6-sender-address.patch
rename to patches/openwrt/0006-Fix-ping6-sender-address.patch
diff --git a/patches/openwrt/0006-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch b/patches/openwrt/0007-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch
similarity index 100%
rename from patches/openwrt/0006-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch
rename to patches/openwrt/0007-ar71xx-add-kernel-support-for-the-TL-WDR3500-board.patch
diff --git a/patches/openwrt/0007-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch b/patches/openwrt/0008-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch
similarity index 100%
rename from patches/openwrt/0007-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch
rename to patches/openwrt/0008-ar71xx-add-user-space-support-for-TL-WDR3500-board.patch
diff --git a/patches/openwrt/0008-ar71xx-build-image-for-the-TL-WDR3500-board.patch b/patches/openwrt/0009-ar71xx-build-image-for-the-TL-WDR3500-board.patch
similarity index 100%
rename from patches/openwrt/0008-ar71xx-build-image-for-the-TL-WDR3500-board.patch
rename to patches/openwrt/0009-ar71xx-build-image-for-the-TL-WDR3500-board.patch
diff --git a/patches/openwrt/0009-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch b/patches/openwrt/0010-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch
similarity index 100%
rename from patches/openwrt/0009-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch
rename to patches/openwrt/0010-ar71xx-add-default-switch-configuration-for-the-TL-WDR3500.patch
diff --git a/patches/openwrt/0010-ar71xx-add-diag-support-for-the-TL-WDR3500.patch b/patches/openwrt/0011-ar71xx-add-diag-support-for-the-TL-WDR3500.patch
similarity index 100%
rename from patches/openwrt/0010-ar71xx-add-diag-support-for-the-TL-WDR3500.patch
rename to patches/openwrt/0011-ar71xx-add-diag-support-for-the-TL-WDR3500.patch
diff --git a/patches/openwrt/0011-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch b/patches/openwrt/0012-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch
similarity index 100%
rename from patches/openwrt/0011-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch
rename to patches/openwrt/0012-ar71xx-remove-numeric-suffix-of-the-TL-WDR3500-USB-LED.patch
diff --git a/patches/openwrt/0012-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch b/patches/openwrt/0013-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch
similarity index 100%
rename from patches/openwrt/0012-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch
rename to patches/openwrt/0013-ar71xx-fix-USB-power-GPIO-on-the-TL-WDR3500.patch
diff --git a/patches/openwrt/0013-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch b/patches/openwrt/0014-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch
similarity index 100%
rename from patches/openwrt/0013-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch
rename to patches/openwrt/0014-ar71xx-add-default-LED-configuration-for-the-WL-WRD3500.patch
diff --git a/patches/openwrt/0014-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch b/patches/openwrt/0015-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch
similarity index 100%
rename from patches/openwrt/0014-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch
rename to patches/openwrt/0015-ar71xx-fix-ethernet-LEDs-on-the-TL-WDR3500.patch
diff --git a/patches/openwrt/0015-ar71xx-add-GPIO-output-select-values-for-AR934x.patch b/patches/openwrt/0016-ar71xx-add-GPIO-output-select-values-for-AR934x.patch
similarity index 100%
rename from patches/openwrt/0015-ar71xx-add-GPIO-output-select-values-for-AR934x.patch
rename to patches/openwrt/0016-ar71xx-add-GPIO-output-select-values-for-AR934x.patch
diff --git a/patches/openwrt/0016-Backport-hostapd-and-mac80211-from-Barrier-Breaker.patch b/patches/openwrt/0017-Backport-hostapd-and-mac80211-from-Barrier-Breaker.patch
similarity index 100%
rename from patches/openwrt/0016-Backport-hostapd-and-mac80211-from-Barrier-Breaker.patch
rename to patches/openwrt/0017-Backport-hostapd-and-mac80211-from-Barrier-Breaker.patch
diff --git a/patches/openwrt/0017-ar71xx-add-support-for-QCA953x-SoC.patch b/patches/openwrt/0018-ar71xx-add-support-for-QCA953x-SoC.patch
similarity index 100%
rename from patches/openwrt/0017-ar71xx-add-support-for-QCA953x-SoC.patch
rename to patches/openwrt/0018-ar71xx-add-support-for-QCA953x-SoC.patch
diff --git a/patches/openwrt/0018-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch b/patches/openwrt/0019-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch
similarity index 100%
rename from patches/openwrt/0018-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch
rename to patches/openwrt/0019-ar71xx-add-support-for-the-TP-LINK-TL-WR841N-ND-v9.patch
diff --git a/patches/openwrt/0019-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch b/patches/openwrt/0020-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch
similarity index 100%
rename from patches/openwrt/0019-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch
rename to patches/openwrt/0020-Backport-support-for-TL-WR842N-v2-and-TL-MR3420-v2.patch