diff --git a/target/u-boot/1.2.0-atmel/.empty b/target/u-boot/1.2.0-atmel/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/target/u-boot/1.3.4/.empty b/target/u-boot/1.3.4/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/target/u-boot/2008.10/.empty b/target/u-boot/2008.10/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/target/u-boot/2009.01/.empty b/target/u-boot/2009.01/.empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in
index be889a0761..cd184045da 100644
--- a/target/u-boot/Makefile.in
+++ b/target/u-boot/Makefile.in
@@ -81,7 +81,7 @@ $(U_BOOT_DIR)/.unpacked: $(DL_DIR)/$(U_BOOT_SOURCE)
 	touch $@
 
 $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked
-	toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot/$(U_BOOT_VERSION) \
+	toolchain/patch-kernel.sh $(U_BOOT_DIR) target/u-boot \
 		u-boot-$(U_BOOT_VERSION)-\*.patch \
 		u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)
 ifneq ($(strip $(U_BOOT_ARCH_PATCH_DIR)),)
diff --git a/target/u-boot/2009.01/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32 b/target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32
similarity index 100%
rename from target/u-boot/2009.01/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32
rename to target/u-boot/u-boot-2009.01-include_asm-avr32_io.h.patch.avr32