diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index d81ec4f1c4a..f5bf1adce74 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -130,19 +130,14 @@ define Package/base-files$(TARGET)/install
 	if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \
 		$(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \
 	fi
-	if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \
-		$(CP) $(PLATFORM_DIR)/base-files/default/* $(1)/; \
+	if [ -d $(PLATFORM_DIR)/base-files/. ]; then \
+		$(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \
 	fi
 	$(if $(filter-out $(PLATFORM_DIR),$(PLATFORM_SUBDIR)), \
-		if [ -d $(PLATFORM_SUBDIR)/base-files/default/. ]; then \
-			$(CP) $(PLATFORM_SUBDIR)/base-files/default/* $(1)/; \
+		if [ -d $(PLATFORM_SUBDIR)/base-files/. ]; then \
+			$(CP) $(PLATFORM_SUBDIR)/base-files/* $(1)/; \
 		fi \
 	)
-	if [ "$(PROFILE)" != "Default" ]; then \
-		if [ -d $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/. ]; then \
-			$(CP) $(PLATFORM_DIR)/base-files/profile-$(PROFILE)/* $(1)/; \
-		fi; \
-	fi
 	$(SED) 's,$$$$R,r$(REV),g' $(1)/etc/banner
 	$(SED) 's,$$$$S,$(BOARD)-$(KERNEL),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/ipkg.conf
 	mkdir -p $(1)/dev
diff --git a/target/linux/adm5120/base-files/default/etc/diag.sh b/target/linux/adm5120/base-files/etc/diag.sh
similarity index 100%
rename from target/linux/adm5120/base-files/default/etc/diag.sh
rename to target/linux/adm5120/base-files/etc/diag.sh
diff --git a/target/linux/adm5120/base-files/default/lib/adm5120.sh b/target/linux/adm5120/base-files/lib/adm5120.sh
similarity index 100%
rename from target/linux/adm5120/base-files/default/lib/adm5120.sh
rename to target/linux/adm5120/base-files/lib/adm5120.sh
diff --git a/target/linux/adm5120/router_le/base-files/default/sbin/wget2nand b/target/linux/adm5120/router_le/base-files/sbin/wget2nand
similarity index 100%
rename from target/linux/adm5120/router_le/base-files/default/sbin/wget2nand
rename to target/linux/adm5120/router_le/base-files/sbin/wget2nand
diff --git a/target/linux/amazon/base-files/default/etc/config/network b/target/linux/amazon/base-files/etc/config/network
similarity index 100%
rename from target/linux/amazon/base-files/default/etc/config/network
rename to target/linux/amazon/base-files/etc/config/network
diff --git a/target/linux/amcc/base-files/default/etc/inittab b/target/linux/amcc/base-files/etc/inittab
similarity index 100%
rename from target/linux/amcc/base-files/default/etc/inittab
rename to target/linux/amcc/base-files/etc/inittab
diff --git a/target/linux/ar7/base-files/default/etc/config/network b/target/linux/ar7/base-files/etc/config/network
similarity index 100%
rename from target/linux/ar7/base-files/default/etc/config/network
rename to target/linux/ar7/base-files/etc/config/network
diff --git a/target/linux/ar7/base-files/default/etc/diag.sh b/target/linux/ar7/base-files/etc/diag.sh
similarity index 100%
rename from target/linux/ar7/base-files/default/etc/diag.sh
rename to target/linux/ar7/base-files/etc/diag.sh
diff --git a/target/linux/ar7/base-files/default/etc/init.d/adam2 b/target/linux/ar7/base-files/etc/init.d/adam2
similarity index 100%
rename from target/linux/ar7/base-files/default/etc/init.d/adam2
rename to target/linux/ar7/base-files/etc/init.d/adam2
diff --git a/target/linux/at91/base-files/default/etc/inittab b/target/linux/at91/base-files/etc/inittab
similarity index 100%
rename from target/linux/at91/base-files/default/etc/inittab
rename to target/linux/at91/base-files/etc/inittab
diff --git a/target/linux/at91/base-files/default/etc/ipkg.conf b/target/linux/at91/base-files/etc/ipkg.conf
similarity index 100%
rename from target/linux/at91/base-files/default/etc/ipkg.conf
rename to target/linux/at91/base-files/etc/ipkg.conf
diff --git a/target/linux/atheros/base-files/default/etc/preinit.arch b/target/linux/atheros/base-files/etc/preinit.arch
similarity index 100%
rename from target/linux/atheros/base-files/default/etc/preinit.arch
rename to target/linux/atheros/base-files/etc/preinit.arch
diff --git a/target/linux/au1000/base-files/default/etc/diag.sh b/target/linux/au1000/base-files/etc/diag.sh
similarity index 100%
rename from target/linux/au1000/base-files/default/etc/diag.sh
rename to target/linux/au1000/base-files/etc/diag.sh
diff --git a/target/linux/brcm-2.4/base-files/default/etc/diag.sh b/target/linux/brcm-2.4/base-files/etc/diag.sh
similarity index 100%
rename from target/linux/brcm-2.4/base-files/default/etc/diag.sh
rename to target/linux/brcm-2.4/base-files/etc/diag.sh
diff --git a/target/linux/brcm-2.4/base-files/default/etc/init.d/netconfig b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
similarity index 100%
rename from target/linux/brcm-2.4/base-files/default/etc/init.d/netconfig
rename to target/linux/brcm-2.4/base-files/etc/init.d/netconfig
diff --git a/target/linux/brcm-2.4/base-files/default/etc/preinit.arch b/target/linux/brcm-2.4/base-files/etc/preinit.arch
similarity index 100%
rename from target/linux/brcm-2.4/base-files/default/etc/preinit.arch
rename to target/linux/brcm-2.4/base-files/etc/preinit.arch
diff --git a/target/linux/brcm-2.4/base-files/default/lib/upgrade/platform.sh b/target/linux/brcm-2.4/base-files/lib/upgrade/platform.sh
similarity index 100%
rename from target/linux/brcm-2.4/base-files/default/lib/upgrade/platform.sh
rename to target/linux/brcm-2.4/base-files/lib/upgrade/platform.sh
diff --git a/target/linux/brcm-2.4/base-files/default/sbin/hotplug.failsafe b/target/linux/brcm-2.4/base-files/sbin/hotplug.failsafe
similarity index 100%
rename from target/linux/brcm-2.4/base-files/default/sbin/hotplug.failsafe
rename to target/linux/brcm-2.4/base-files/sbin/hotplug.failsafe
diff --git a/target/linux/etrax/base-files/default/etc/config/network b/target/linux/etrax/base-files/etc/config/network
similarity index 100%
rename from target/linux/etrax/base-files/default/etc/config/network
rename to target/linux/etrax/base-files/etc/config/network
diff --git a/target/linux/etrax/base-files/default/etc/ipkg.conf b/target/linux/etrax/base-files/etc/ipkg.conf
similarity index 100%
rename from target/linux/etrax/base-files/default/etc/ipkg.conf
rename to target/linux/etrax/base-files/etc/ipkg.conf
diff --git a/target/linux/etrax/base-files/default/etc/passwd b/target/linux/etrax/base-files/etc/passwd
similarity index 100%
rename from target/linux/etrax/base-files/default/etc/passwd
rename to target/linux/etrax/base-files/etc/passwd
diff --git a/target/linux/iop32x/base-files/default/etc/config/network b/target/linux/iop32x/base-files/etc/config/network
similarity index 100%
rename from target/linux/iop32x/base-files/default/etc/config/network
rename to target/linux/iop32x/base-files/etc/config/network
diff --git a/target/linux/ixp4xx/base-files/default/etc/config/network b/target/linux/ixp4xx/base-files/etc/config/network
similarity index 100%
rename from target/linux/ixp4xx/base-files/default/etc/config/network
rename to target/linux/ixp4xx/base-files/etc/config/network
diff --git a/target/linux/rb532/base-files/default/etc/config/network b/target/linux/rb532/base-files/etc/config/network
similarity index 100%
rename from target/linux/rb532/base-files/default/etc/config/network
rename to target/linux/rb532/base-files/etc/config/network
diff --git a/target/linux/rb532/base-files/default/etc/diag.sh b/target/linux/rb532/base-files/etc/diag.sh
similarity index 100%
rename from target/linux/rb532/base-files/default/etc/diag.sh
rename to target/linux/rb532/base-files/etc/diag.sh
diff --git a/target/linux/rb532/base-files/default/sbin/cf2nand b/target/linux/rb532/base-files/sbin/cf2nand
similarity index 100%
rename from target/linux/rb532/base-files/default/sbin/cf2nand
rename to target/linux/rb532/base-files/sbin/cf2nand
diff --git a/target/linux/rb532/base-files/default/sbin/wget2nand b/target/linux/rb532/base-files/sbin/wget2nand
similarity index 100%
rename from target/linux/rb532/base-files/default/sbin/wget2nand
rename to target/linux/rb532/base-files/sbin/wget2nand
diff --git a/target/linux/rdc/base-files/default/etc/diag.sh b/target/linux/rdc/base-files/etc/diag.sh
similarity index 100%
rename from target/linux/rdc/base-files/default/etc/diag.sh
rename to target/linux/rdc/base-files/etc/diag.sh
diff --git a/target/linux/rdc/base-files/default/etc/inittab b/target/linux/rdc/base-files/etc/inittab
similarity index 100%
rename from target/linux/rdc/base-files/default/etc/inittab
rename to target/linux/rdc/base-files/etc/inittab
diff --git a/target/linux/sibyte/base-files/default/etc/config/network b/target/linux/sibyte/base-files/etc/config/network
similarity index 100%
rename from target/linux/sibyte/base-files/default/etc/config/network
rename to target/linux/sibyte/base-files/etc/config/network
diff --git a/target/linux/sibyte/base-files/default/etc/inittab b/target/linux/sibyte/base-files/etc/inittab
similarity index 100%
rename from target/linux/sibyte/base-files/default/etc/inittab
rename to target/linux/sibyte/base-files/etc/inittab
diff --git a/target/linux/x86/base-files/default/etc/preinit.arch b/target/linux/x86/base-files/etc/preinit.arch
similarity index 100%
rename from target/linux/x86/base-files/default/etc/preinit.arch
rename to target/linux/x86/base-files/etc/preinit.arch
diff --git a/target/linux/x86/base-files/default/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
similarity index 100%
rename from target/linux/x86/base-files/default/lib/upgrade/platform.sh
rename to target/linux/x86/base-files/lib/upgrade/platform.sh