diff --git a/openwrt/target/linux/package/Makefile b/openwrt/target/linux/package/Makefile
index 97d20251e..ad9b21a2e 100644
--- a/openwrt/target/linux/package/Makefile
+++ b/openwrt/target/linux/package/Makefile
@@ -9,12 +9,12 @@ package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo
 package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
 package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
 package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi
-package-y += openwrt
+package-y += base-files
 
 ifeq ($(BOARD)-$(KERNEL),brcm-2.4)
 package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat
 package-$(BR2_PACKAGE_KMOD_DIAG) += diag
-wlcompat-compile: openwrt-compile
+wlcompat-compile: base-files-compile
 endif
 
 all: compile install
diff --git a/openwrt/target/linux/package/openwrt/Makefile b/openwrt/target/linux/package/base-files/Makefile
similarity index 100%
rename from openwrt/target/linux/package/openwrt/Makefile
rename to openwrt/target/linux/package/base-files/Makefile
diff --git a/openwrt/target/linux/package/openwrt/files/ar7-2.4/etc/config/network b/openwrt/target/linux/package/base-files/files/ar7-2.4/etc/config/network
similarity index 100%
rename from openwrt/target/linux/package/openwrt/files/ar7-2.4/etc/config/network
rename to openwrt/target/linux/package/base-files/files/ar7-2.4/etc/config/network
diff --git a/openwrt/target/linux/package/openwrt/files/ar7-2.4/etc/network.overrides b/openwrt/target/linux/package/base-files/files/ar7-2.4/etc/network.overrides
similarity index 100%
rename from openwrt/target/linux/package/openwrt/files/ar7-2.4/etc/network.overrides
rename to openwrt/target/linux/package/base-files/files/ar7-2.4/etc/network.overrides
diff --git a/openwrt/target/linux/package/openwrt/files/brcm-2.4/etc/config/network b/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/config/network
similarity index 100%
rename from openwrt/target/linux/package/openwrt/files/brcm-2.4/etc/config/network
rename to openwrt/target/linux/package/base-files/files/brcm-2.4/etc/config/network
diff --git a/openwrt/target/linux/package/openwrt/files/brcm-2.4/etc/init.d/S05nvram b/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram
similarity index 100%
rename from openwrt/target/linux/package/openwrt/files/brcm-2.4/etc/init.d/S05nvram
rename to openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram
diff --git a/openwrt/target/linux/package/openwrt/files/brcm-2.4/etc/network.overrides b/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/network.overrides
similarity index 100%
rename from openwrt/target/linux/package/openwrt/files/brcm-2.4/etc/network.overrides
rename to openwrt/target/linux/package/base-files/files/brcm-2.4/etc/network.overrides
diff --git a/openwrt/target/linux/package/openwrt/files/brcm-2.6/etc/config/network b/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/config/network
similarity index 100%
rename from openwrt/target/linux/package/openwrt/files/brcm-2.6/etc/config/network
rename to openwrt/target/linux/package/base-files/files/brcm-2.6/etc/config/network
diff --git a/openwrt/target/linux/package/openwrt/files/brcm-2.6/etc/inittab b/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/inittab
similarity index 100%
rename from openwrt/target/linux/package/openwrt/files/brcm-2.6/etc/inittab
rename to openwrt/target/linux/package/base-files/files/brcm-2.6/etc/inittab
diff --git a/openwrt/target/linux/package/openwrt/files/brcm-2.6/etc/network.overrides b/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/network.overrides
similarity index 100%
rename from openwrt/target/linux/package/openwrt/files/brcm-2.6/etc/network.overrides
rename to openwrt/target/linux/package/base-files/files/brcm-2.6/etc/network.overrides
diff --git a/openwrt/target/linux/package/openwrt/files/soekris-2.4/etc/config/network b/openwrt/target/linux/package/base-files/files/soekris-2.4/etc/config/network
similarity index 100%
rename from openwrt/target/linux/package/openwrt/files/soekris-2.4/etc/config/network
rename to openwrt/target/linux/package/base-files/files/soekris-2.4/etc/config/network
diff --git a/openwrt/target/linux/package/openwrt/files/soekris-2.4/etc/network.overrides b/openwrt/target/linux/package/base-files/files/soekris-2.4/etc/network.overrides
similarity index 100%
rename from openwrt/target/linux/package/openwrt/files/soekris-2.4/etc/network.overrides
rename to openwrt/target/linux/package/base-files/files/soekris-2.4/etc/network.overrides
diff --git a/openwrt/target/linux/package/openwrt/include/bcmnvram.h b/openwrt/target/linux/package/base-files/include/bcmnvram.h
similarity index 100%
rename from openwrt/target/linux/package/openwrt/include/bcmnvram.h
rename to openwrt/target/linux/package/base-files/include/bcmnvram.h
diff --git a/openwrt/target/linux/package/openwrt/include/bcmutils.h b/openwrt/target/linux/package/base-files/include/bcmutils.h
similarity index 100%
rename from openwrt/target/linux/package/openwrt/include/bcmutils.h
rename to openwrt/target/linux/package/base-files/include/bcmutils.h
diff --git a/openwrt/target/linux/package/openwrt/include/cy_conf.h b/openwrt/target/linux/package/base-files/include/cy_conf.h
similarity index 100%
rename from openwrt/target/linux/package/openwrt/include/cy_conf.h
rename to openwrt/target/linux/package/base-files/include/cy_conf.h
diff --git a/openwrt/target/linux/package/openwrt/include/epivers.h b/openwrt/target/linux/package/base-files/include/epivers.h
similarity index 100%
rename from openwrt/target/linux/package/openwrt/include/epivers.h
rename to openwrt/target/linux/package/base-files/include/epivers.h
diff --git a/openwrt/target/linux/package/openwrt/include/proto/802.11.h b/openwrt/target/linux/package/base-files/include/proto/802.11.h
similarity index 100%
rename from openwrt/target/linux/package/openwrt/include/proto/802.11.h
rename to openwrt/target/linux/package/base-files/include/proto/802.11.h
diff --git a/openwrt/target/linux/package/openwrt/include/proto/ethernet.h b/openwrt/target/linux/package/base-files/include/proto/ethernet.h
similarity index 100%
rename from openwrt/target/linux/package/openwrt/include/proto/ethernet.h
rename to openwrt/target/linux/package/base-files/include/proto/ethernet.h
diff --git a/openwrt/target/linux/package/openwrt/include/shutils.h b/openwrt/target/linux/package/base-files/include/shutils.h
similarity index 100%
rename from openwrt/target/linux/package/openwrt/include/shutils.h
rename to openwrt/target/linux/package/base-files/include/shutils.h
diff --git a/openwrt/target/linux/package/openwrt/include/typedefs.h b/openwrt/target/linux/package/base-files/include/typedefs.h
similarity index 100%
rename from openwrt/target/linux/package/openwrt/include/typedefs.h
rename to openwrt/target/linux/package/base-files/include/typedefs.h
diff --git a/openwrt/target/linux/package/openwrt/include/utils.h b/openwrt/target/linux/package/base-files/include/utils.h
similarity index 100%
rename from openwrt/target/linux/package/openwrt/include/utils.h
rename to openwrt/target/linux/package/base-files/include/utils.h
diff --git a/openwrt/target/linux/package/openwrt/include/wlcompat.h b/openwrt/target/linux/package/base-files/include/wlcompat.h
similarity index 100%
rename from openwrt/target/linux/package/openwrt/include/wlcompat.h
rename to openwrt/target/linux/package/base-files/include/wlcompat.h
diff --git a/openwrt/target/linux/package/openwrt/include/wlioctl.h b/openwrt/target/linux/package/base-files/include/wlioctl.h
similarity index 100%
rename from openwrt/target/linux/package/openwrt/include/wlioctl.h
rename to openwrt/target/linux/package/base-files/include/wlioctl.h
diff --git a/openwrt/target/linux/package/openwrt/include/wlutils.h b/openwrt/target/linux/package/base-files/include/wlutils.h
similarity index 100%
rename from openwrt/target/linux/package/openwrt/include/wlutils.h
rename to openwrt/target/linux/package/base-files/include/wlutils.h
diff --git a/openwrt/target/linux/package/openwrt/ipkg/base-files-arch.control b/openwrt/target/linux/package/base-files/ipkg/base-files-arch.control
similarity index 100%
rename from openwrt/target/linux/package/openwrt/ipkg/base-files-arch.control
rename to openwrt/target/linux/package/base-files/ipkg/base-files-arch.control
diff --git a/openwrt/target/linux/package/openwrt/jffs2root.c b/openwrt/target/linux/package/base-files/jffs2root.c
similarity index 100%
rename from openwrt/target/linux/package/openwrt/jffs2root.c
rename to openwrt/target/linux/package/base-files/jffs2root.c