diff --git a/target/linux/generic-2.6/patches/001-squashfs.patch b/target/linux/generic-2.6/patches-2.6.21/001-squashfs.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/001-squashfs.patch
rename to target/linux/generic-2.6/patches-2.6.21/001-squashfs.patch
diff --git a/target/linux/generic-2.6/patches/002-lzma_decompress.patch b/target/linux/generic-2.6/patches-2.6.21/002-lzma_decompress.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/002-lzma_decompress.patch
rename to target/linux/generic-2.6/patches-2.6.21/002-lzma_decompress.patch
diff --git a/target/linux/generic-2.6/patches/003-squashfs_lzma.patch b/target/linux/generic-2.6/patches-2.6.21/003-squashfs_lzma.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/003-squashfs_lzma.patch
rename to target/linux/generic-2.6/patches-2.6.21/003-squashfs_lzma.patch
diff --git a/target/linux/generic-2.6/patches/004-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.21/004-extra_optimization.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/004-extra_optimization.patch
rename to target/linux/generic-2.6/patches-2.6.21/004-extra_optimization.patch
diff --git a/target/linux/generic-2.6/patches/006-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.21/006-gcc4_inline_fix.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/006-gcc4_inline_fix.patch
rename to target/linux/generic-2.6/patches-2.6.21/006-gcc4_inline_fix.patch
diff --git a/target/linux/generic-2.6/patches/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.21/007-samsung_flash.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/007-samsung_flash.patch
rename to target/linux/generic-2.6/patches-2.6.21/007-samsung_flash.patch
diff --git a/target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches-2.6.21/009-revert_intel_flash_breakage.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/009-revert_intel_flash_breakage.patch
rename to target/linux/generic-2.6/patches-2.6.21/009-revert_intel_flash_breakage.patch
diff --git a/target/linux/generic-2.6/patches/010-disable_old_squashfs_compatibility.patch b/target/linux/generic-2.6/patches-2.6.21/010-disable_old_squashfs_compatibility.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/010-disable_old_squashfs_compatibility.patch
rename to target/linux/generic-2.6/patches-2.6.21/010-disable_old_squashfs_compatibility.patch
diff --git a/target/linux/generic-2.6/patches/011-mips_boot.patch b/target/linux/generic-2.6/patches-2.6.21/011-mips_boot.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/011-mips_boot.patch
rename to target/linux/generic-2.6/patches-2.6.21/011-mips_boot.patch
diff --git a/target/linux/generic-2.6/patches/012-mips_cpu_tlb.patch b/target/linux/generic-2.6/patches-2.6.21/012-mips_cpu_tlb.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/012-mips_cpu_tlb.patch
rename to target/linux/generic-2.6/patches-2.6.21/012-mips_cpu_tlb.patch
diff --git a/target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch b/target/linux/generic-2.6/patches-2.6.21/013-mips_generic_gpio_support.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch
rename to target/linux/generic-2.6/patches-2.6.21/013-mips_generic_gpio_support.patch
diff --git a/target/linux/generic-2.6/patches/060-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.21/060-rootfs_split.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/060-rootfs_split.patch
rename to target/linux/generic-2.6/patches-2.6.21/060-rootfs_split.patch
diff --git a/target/linux/generic-2.6/patches/065-block2mtd_init.patch b/target/linux/generic-2.6/patches-2.6.21/065-block2mtd_init.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/065-block2mtd_init.patch
rename to target/linux/generic-2.6/patches-2.6.21/065-block2mtd_init.patch
diff --git a/target/linux/generic-2.6/patches/100-netfilter_layer7_2.17.patch b/target/linux/generic-2.6/patches-2.6.21/100-netfilter_layer7_2.17.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/100-netfilter_layer7_2.17.patch
rename to target/linux/generic-2.6/patches-2.6.21/100-netfilter_layer7_2.17.patch
diff --git a/target/linux/generic-2.6/patches/101-netfilter_layer7_pktmatch.patch b/target/linux/generic-2.6/patches-2.6.21/101-netfilter_layer7_pktmatch.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/101-netfilter_layer7_pktmatch.patch
rename to target/linux/generic-2.6/patches-2.6.21/101-netfilter_layer7_pktmatch.patch
diff --git a/target/linux/generic-2.6/patches/110-ipp2p_0.8.1rc1.patch b/target/linux/generic-2.6/patches-2.6.21/110-ipp2p_0.8.1rc1.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/110-ipp2p_0.8.1rc1.patch
rename to target/linux/generic-2.6/patches-2.6.21/110-ipp2p_0.8.1rc1.patch
diff --git a/target/linux/generic-2.6/patches/120-openswan-2.4.0.kernel-2.6-natt.patch b/target/linux/generic-2.6/patches-2.6.21/120-openswan-2.4.0.kernel-2.6-natt.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/120-openswan-2.4.0.kernel-2.6-natt.patch
rename to target/linux/generic-2.6/patches-2.6.21/120-openswan-2.4.0.kernel-2.6-natt.patch
diff --git a/target/linux/generic-2.6/patches/130-netfilter_ipset.patch b/target/linux/generic-2.6/patches-2.6.21/130-netfilter_ipset.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/130-netfilter_ipset.patch
rename to target/linux/generic-2.6/patches-2.6.21/130-netfilter_ipset.patch
diff --git a/target/linux/generic-2.6/patches/140-netfilter_time.patch b/target/linux/generic-2.6/patches-2.6.21/140-netfilter_time.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/140-netfilter_time.patch
rename to target/linux/generic-2.6/patches-2.6.21/140-netfilter_time.patch
diff --git a/target/linux/generic-2.6/patches/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.21/150-netfilter_imq.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/150-netfilter_imq.patch
rename to target/linux/generic-2.6/patches-2.6.21/150-netfilter_imq.patch
diff --git a/target/linux/generic-2.6/patches/160-netfilter_route.patch b/target/linux/generic-2.6/patches-2.6.21/160-netfilter_route.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/160-netfilter_route.patch
rename to target/linux/generic-2.6/patches-2.6.21/160-netfilter_route.patch
diff --git a/target/linux/generic-2.6/patches/170-netfilter_chaostables_0.8.patch b/target/linux/generic-2.6/patches-2.6.21/170-netfilter_chaostables_0.8.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/170-netfilter_chaostables_0.8.patch
rename to target/linux/generic-2.6/patches-2.6.21/170-netfilter_chaostables_0.8.patch
diff --git a/target/linux/generic-2.6/patches/171-netfilter_tarpit.patch b/target/linux/generic-2.6/patches-2.6.21/171-netfilter_tarpit.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/171-netfilter_tarpit.patch
rename to target/linux/generic-2.6/patches-2.6.21/171-netfilter_tarpit.patch
diff --git a/target/linux/generic-2.6/patches/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.21/180-netfilter_depends.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/180-netfilter_depends.patch
rename to target/linux/generic-2.6/patches-2.6.21/180-netfilter_depends.patch
diff --git a/target/linux/generic-2.6/patches/200-sched_esfq.patch b/target/linux/generic-2.6/patches-2.6.21/200-sched_esfq.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/200-sched_esfq.patch
rename to target/linux/generic-2.6/patches-2.6.21/200-sched_esfq.patch
diff --git a/target/linux/generic-2.6/patches/201-multiple_default_gateways.patch b/target/linux/generic-2.6/patches-2.6.21/201-multiple_default_gateways.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/201-multiple_default_gateways.patch
rename to target/linux/generic-2.6/patches-2.6.21/201-multiple_default_gateways.patch
diff --git a/target/linux/generic-2.6/patches/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.21/202-mips-freestanding.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/202-mips-freestanding.patch
rename to target/linux/generic-2.6/patches-2.6.21/202-mips-freestanding.patch
diff --git a/target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch b/target/linux/generic-2.6/patches-2.6.21/204-jffs2_eofdetect.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/204-jffs2_eofdetect.patch
rename to target/linux/generic-2.6/patches-2.6.21/204-jffs2_eofdetect.patch
diff --git a/target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch b/target/linux/generic-2.6/patches-2.6.21/207-powerpc_asm_segment_h.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/207-powerpc_asm_segment_h.patch
rename to target/linux/generic-2.6/patches-2.6.21/207-powerpc_asm_segment_h.patch
diff --git a/target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.21/208-rtl8110sb_fix.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch
rename to target/linux/generic-2.6/patches-2.6.21/208-rtl8110sb_fix.patch
diff --git a/target/linux/generic-2.6/patches/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.21/209-mini_fo.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/209-mini_fo.patch
rename to target/linux/generic-2.6/patches-2.6.21/209-mini_fo.patch
diff --git a/target/linux/generic-2.6/patches/210-d80211_compat.patch b/target/linux/generic-2.6/patches-2.6.21/210-d80211_compat.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/210-d80211_compat.patch
rename to target/linux/generic-2.6/patches-2.6.21/210-d80211_compat.patch
diff --git a/target/linux/generic-2.6/patches/211-no_block2mtd_readahead.patch b/target/linux/generic-2.6/patches-2.6.21/211-no_block2mtd_readahead.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/211-no_block2mtd_readahead.patch
rename to target/linux/generic-2.6/patches-2.6.21/211-no_block2mtd_readahead.patch
diff --git a/target/linux/generic-2.6/patches/212-block2mtd_erase_scan.patch b/target/linux/generic-2.6/patches-2.6.21/212-block2mtd_erase_scan.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/212-block2mtd_erase_scan.patch
rename to target/linux/generic-2.6/patches-2.6.21/212-block2mtd_erase_scan.patch
diff --git a/target/linux/generic-2.6/patches/213-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.21/213-kobject_uevent.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/213-kobject_uevent.patch
rename to target/linux/generic-2.6/patches-2.6.21/213-kobject_uevent.patch
diff --git a/target/linux/generic-2.6/patches/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.21/420-gpiodev.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/420-gpiodev.patch
rename to target/linux/generic-2.6/patches-2.6.21/420-gpiodev.patch
diff --git a/target/linux/generic-2.6/patches/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.21/510-yaffs_support.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/510-yaffs_support.patch
rename to target/linux/generic-2.6/patches-2.6.21/510-yaffs_support.patch
diff --git a/target/linux/generic-2.6/patches/511-yaffs_reduce_compiler_warnings.patch b/target/linux/generic-2.6/patches-2.6.21/511-yaffs_reduce_compiler_warnings.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/511-yaffs_reduce_compiler_warnings.patch
rename to target/linux/generic-2.6/patches-2.6.21/511-yaffs_reduce_compiler_warnings.patch
diff --git a/target/linux/generic-2.6/patches/900-headers_type_and_time.patch b/target/linux/generic-2.6/patches-2.6.21/900-headers_type_and_time.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/900-headers_type_and_time.patch
rename to target/linux/generic-2.6/patches-2.6.21/900-headers_type_and_time.patch
diff --git a/target/linux/generic-2.6/patches/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.21/902-darwin_scripts_include.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/902-darwin_scripts_include.patch
rename to target/linux/generic-2.6/patches-2.6.21/902-darwin_scripts_include.patch
diff --git a/target/linux/generic-2.6/patches/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.21/903-hostap_txpower.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/903-hostap_txpower.patch
rename to target/linux/generic-2.6/patches-2.6.21/903-hostap_txpower.patch
diff --git a/target/linux/generic-2.6/patches/903-stddef_include.patch b/target/linux/generic-2.6/patches-2.6.21/903-stddef_include.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/903-stddef_include.patch
rename to target/linux/generic-2.6/patches-2.6.21/903-stddef_include.patch
diff --git a/target/linux/generic-2.6/patches/904-ls_time_locale.patch b/target/linux/generic-2.6/patches-2.6.21/904-ls_time_locale.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/904-ls_time_locale.patch
rename to target/linux/generic-2.6/patches-2.6.21/904-ls_time_locale.patch
diff --git a/target/linux/generic-2.6/patches/999-backport_ip_hdr_and_friends.patch b/target/linux/generic-2.6/patches-2.6.21/999-backport_ip_hdr_and_friends.patch
similarity index 100%
rename from target/linux/generic-2.6/patches/999-backport_ip_hdr_and_friends.patch
rename to target/linux/generic-2.6/patches-2.6.21/999-backport_ip_hdr_and_friends.patch