133 files changed, 345 insertions, 1313 deletions

diff --git a/CHANGES b/CHANGES
index d0a827b14..99900ad9c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,22 +14,27 @@
 	New packages: cgilua, copas, coxpcall, ffmpeg, libsvgtiny,
 	luafilesystem, luasocket, rings, wsapi, xavante, xterm
 
-	Updated/fixed packages: berkeleydb, bash, blackbox, busybox,
-	bzip2, cdrkit, cmake, dash, dialog, diffutils, distcc,
-	dmalloc, dnsmasq, dropbear, e2fsprogs, fbv, file, fontconfig,
-	gawk, gstreamer, gzip, intltool, ipsec-tools, iptables,
-	libart, libcgi, libfuse, libgpg-error, libidn, liblockfile,
-	libpng, links, linux-fusion, lmbench, lrzsz, make,
-	module-init-tools, nbd, ncurses, netperf, ntfsprogs, openssl,
-	php, qt, quagga, sqlite, sdl, sdl_mixer, sdl_sound, sdl_ttf,
-	squashfs, tn5250, tremor, usbutils, xkeyboard-config,
-	xserver_xorg-server, xvkbd
+	Updated/fixed packages: alsa-lib, berkeleydb, bash, blackbox,
+	busybox, bzip2, cdrkit, cmake, dash, dhcp, dialog, diffutils,
+	distcc, dmalloc, dnsmasq, dropbear, e2fsprogs, fbv, file,
+	fontconfig, gawk, gstreamer, gzip, intltool, ipsec-tools,
+	iptables, libart, libcgi, libfuse, libgpg-error, libidn,
+	liblockfile, libpng, links, linux-fusion, lmbench, lrzsz,
+	make, module-init-tools, mysql_client, nbd, ncurses, neon,
+	netperf, ntfsprogs, openssl, php, qt, quagga, sqlite, sdl,
+	sdl_mixer, sdl_sound, sdl_ttf, squashfs, tn5250, tremor,
+	usbutils, xkeyboard-config, xserver_xorg-server, xvkbd
 
 	Removed packages: modutils, portage, rxvt
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#361:  linux kernel configuration choice works incorrectly
+	#387:  Tremor not installed to toolchain
 	#401:  new package: ffmpeg
+	#475:  uImage target for U-boot failed generating
+	#583:  build fails with external x86_64 toolchain
+	#729:  sstrip creates corrupted headers
 	#835:  Package Dataflashboot-1.05 does not compile with buildroot...
 	#1213: Move .config into output directory
 	#1753: lmbench: convert to generic package infrastructure
@@ -62,6 +67,7 @@
 	#2167: Bump busybox to 1.17.0, convert to gentargets, drop 1.12, ...
 	#2191: linux-fusion build fail
 	#2221: Qt does not compile (dependencies not taken into account?)
+	#2233: Atmel atstk target skeletons have /etc/mtab as a file, not ...
 
 2010.05, Released May 30th, 2010:
 
diff --git a/Makefile b/Makefile
index d6bcb36f0..744cae445 100644
--- a/Makefile
+++ b/Makefile
@@ -271,6 +271,7 @@ STAMP_DIR:=$(BASE_DIR)/stamps
 BINARIES_DIR:=$(BASE_DIR)/images
 TARGET_DIR:=$(BASE_DIR)/target
 TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
+TARGET_SKELETON=$(BASE_DIR)/fs/skeleton
 
 BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config
 
@@ -366,6 +367,10 @@ $(STAGING_DIR):
 	@mkdir -p $(STAGING_DIR)/usr/include
 	@mkdir -p $(STAGING_DIR)/usr/bin
 
+ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
+TARGET_SKELETON=$(BR2_ROOTFS_SKELETON_CUSTOM_PATH)
+endif
+
 $(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
 	if ! [ -d "$(TARGET_DIR)/bin" ]; then \
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index 4c1e2c24f..3062541cc 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -408,7 +408,7 @@ BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 # BR2_PACKAGE_BOA is not set
 # BR2_PACKAGE_BIND is not set
 # BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_ISC_DHCP is not set
+# BR2_PACKAGE_DHCP is not set
 # BR2_PACKAGE_DNSMASQ is not set
 # BR2_PACKAGE_DROPBEAR is not set
 # BR2_PACKAGE_ETHTOOL is not set
diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index 0d453b6d5..98158b985 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -322,7 +322,6 @@ BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/at91rm9200df_ext_bare_defconfig b/configs/at91rm9200df_ext_bare_defconfig
index 1622cc784..fec2c04ab 100644
--- a/configs/at91rm9200df_ext_bare_defconfig
+++ b/configs/at91rm9200df_ext_bare_defconfig
@@ -329,7 +329,7 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_PACKAGE_BOA is not set
 # BR2_PACKAGE_BIND is not set
 # BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_ISC_DHCP is not set
+# BR2_PACKAGE_DHCP is not set
 # BR2_PACKAGE_DNSMASQ is not set
 # BR2_PACKAGE_DROPBEAR is not set
 # BR2_PACKAGE_ETHTOOL is not set
diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig
index 7245b8a49..c73e37273 100644
--- a/configs/at91rm9200df_ext_defconfig
+++ b/configs/at91rm9200df_ext_defconfig
@@ -248,7 +248,6 @@ BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 3de2aea07..f1d63df2e 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -334,7 +334,6 @@ BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/at91sam9260dfc_ext_bare_defconfig b/configs/at91sam9260dfc_ext_bare_defconfig
index f1939ccea..540eef666 100644
--- a/configs/at91sam9260dfc_ext_bare_defconfig
+++ b/configs/at91sam9260dfc_ext_bare_defconfig
@@ -329,7 +329,7 @@ BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
 # BR2_PACKAGE_BOA is not set
 # BR2_PACKAGE_BIND is not set
 # BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_ISC_DHCP is not set
+# BR2_PACKAGE_DHCP is not set
 # BR2_PACKAGE_DNSMASQ is not set
 # BR2_PACKAGE_DROPBEAR is not set
 # BR2_PACKAGE_ETHTOOL is not set
diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig
index e66a541a3..91cdeddab 100644
--- a/configs/at91sam9260dfc_ext_defconfig
+++ b/configs/at91sam9260dfc_ext_defconfig
@@ -256,7 +256,6 @@ BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig
index d444158e9..651041fd3 100644
--- a/configs/at91sam9260pf_defconfig
+++ b/configs/at91sam9260pf_defconfig
@@ -238,7 +238,6 @@ BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
@@ -330,7 +329,7 @@ BR2_NETWORK_SUPPORT=y
 # BR2_PACKAGE_BRIDGE is not set
 # BR2_PACKAGE_CURL is not set
 # BR2_PACKAGE_LIBCURL is not set
-BR2_PACKAGE_ISC_DHCP=y
+BR2_PACKAGE_DHCP=y
 # BR2_PACKAGE_DHCP_SERVER is not set
 # BR2_PACKAGE_DHCP_RELAY is not set
 BR2_PACKAGE_DHCP_CLIENT=y
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index b8b5d6034..0d2fa0b06 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -328,7 +328,6 @@ BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/at91sam9261ek_ext_bare_defconfig b/configs/at91sam9261ek_ext_bare_defconfig
index e116f4486..ab8851f9c 100644
--- a/configs/at91sam9261ek_ext_bare_defconfig
+++ b/configs/at91sam9261ek_ext_bare_defconfig
@@ -332,7 +332,7 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_PACKAGE_BOA is not set
 # BR2_PACKAGE_BIND is not set
 # BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_ISC_DHCP is not set
+# BR2_PACKAGE_DHCP is not set
 # BR2_PACKAGE_DNSMASQ is not set
 # BR2_PACKAGE_DROPBEAR is not set
 # BR2_PACKAGE_ETHTOOL is not set
diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig
index 7e0e84fb9..ca9a65cef 100644
--- a/configs/at91sam9261ek_ext_defconfig
+++ b/configs/at91sam9261ek_ext_defconfig
@@ -287,7 +287,6 @@ BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index de2a12df4..6b4f592ff 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -327,7 +327,6 @@ BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/at91sam9263ek_ext_bare_defconfig b/configs/at91sam9263ek_ext_bare_defconfig
index 4efc758be..2578b9509 100644
--- a/configs/at91sam9263ek_ext_bare_defconfig
+++ b/configs/at91sam9263ek_ext_bare_defconfig
@@ -331,7 +331,7 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_PACKAGE_BOA is not set
 # BR2_PACKAGE_BIND is not set
 # BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_ISC_DHCP is not set
+# BR2_PACKAGE_DHCP is not set
 # BR2_PACKAGE_DNSMASQ is not set
 # BR2_PACKAGE_DROPBEAR is not set
 # BR2_PACKAGE_ETHTOOL is not set
diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig
index d757aaa2b..3f6c3b8e9 100644
--- a/configs/at91sam9263ek_ext_defconfig
+++ b/configs/at91sam9263ek_ext_defconfig
@@ -249,7 +249,6 @@ BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index ffe4636f8..92171d5e8 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -327,7 +327,6 @@ BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/at91sam9g20dfc_ext_bare_defconfig b/configs/at91sam9g20dfc_ext_bare_defconfig
index 22676b7a5..49a5124cb 100644
--- a/configs/at91sam9g20dfc_ext_bare_defconfig
+++ b/configs/at91sam9g20dfc_ext_bare_defconfig
@@ -329,7 +329,7 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_PACKAGE_BOA is not set
 # BR2_PACKAGE_BIND is not set
 # BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_ISC_DHCP is not set
+# BR2_PACKAGE_DHCP is not set
 # BR2_PACKAGE_DNSMASQ is not set
 # BR2_PACKAGE_DROPBEAR is not set
 # BR2_PACKAGE_ETHTOOL is not set
diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig
index 2cf2839b6..bd967235f 100644
--- a/configs/at91sam9g20dfc_ext_defconfig
+++ b/configs/at91sam9g20dfc_ext_defconfig
@@ -256,7 +256,6 @@ BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index 8c3d80bd7..f5eba61aa 100644
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -246,7 +246,6 @@ BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 763cad776..d1db2da38 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -243,7 +243,6 @@ BR2_BUSYBOX_VERSION="1.16.1"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-BR2_PACKAGE_BUSYBOX_SKELETON=y
 # BR2_PACKAGE_CUSTOMIZE is not set
 
 #
diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index ab8b36998..b90761b72 100644
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -266,7 +266,6 @@ BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index 0a718de92..c12ccf88a 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -257,7 +257,6 @@ BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="target/device/Atmel/atstk100x/busybox-1.9.1.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
 # The minimum needed to build a uClibc development system
@@ -376,7 +375,7 @@ BR2_PACKAGE_AVAHI_AUTOIPD=y
 # BR2_PACKAGE_BOA is not set
 # BR2_PACKAGE_BIND is not set
 # BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_ISC_DHCP is not set
+# BR2_PACKAGE_DHCP is not set
 # BR2_PACKAGE_DNSMASQ is not set
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_ETHTOOL is not set
diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index 69e6412a3..65825bee4 100644
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -256,7 +256,6 @@ BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index e4d4f98a1..31ce604fd 100644
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -256,7 +256,6 @@ BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index 815d2591d..2eb22c5d1 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -254,7 +254,6 @@ BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index 9b6825835..e44ac5fba 100644
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -255,7 +255,6 @@ BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
 # The minimum needed to build a uClibc development system
diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index 9300f28fe..2895d8a94 100644
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -254,7 +254,6 @@ BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
 # The minimum needed to build a uClibc development system
@@ -360,7 +359,7 @@ BR2_NETWORK_SUPPORT=y
 # BR2_PACKAGE_BRIDGE is not set
 # BR2_PACKAGE_CURL is not set
 # BR2_PACKAGE_LIBCURL is not set
-# BR2_PACKAGE_ISC_DHCP is not set
+# BR2_PACKAGE_DHCP is not set
 # BR2_PACKAGE_DNSMASQ is not set
 # BR2_PACKAGE_DROPBEAR is not set
 # BR2_PACKAGE_ETHTOOL is not set
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index c85a4d8bf..80f194a56 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -229,7 +229,6 @@ BR2_BUSYBOX_VERSION="1.12.1"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="target/device/valka/v100sc2/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
 # The minimum needed to build a uClibc development system
@@ -335,7 +334,7 @@ BR2_NETWORK_SUPPORT=y
 # BR2_PACKAGE_BRIDGE is not set
 # BR2_PACKAGE_CURL is not set
 # BR2_PACKAGE_LIBCURL is not set
-# BR2_PACKAGE_ISC_DHCP is not set
+# BR2_PACKAGE_DHCP is not set
 # BR2_PACKAGE_DNSMASQ is not set
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_ETHTOOL is not set
diff --git a/fs/Config.in b/fs/Config.in
index 6865eeaff..188e8155b 100644
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -23,6 +23,29 @@ config BR2_ROOTFS_DEVICE_TABLE
          to the makedevs utility to create all the special device
          files in the target filesystem.
 
+choice
+	prompt "Root FS skeleton"
+
+config BR2_ROOTFS_SKELETON_DEFAULT
+	bool "default target skeleton"
+	help
+	  Use default target skeleton
+
+config BR2_ROOTFS_SKELETON_CUSTOM
+	bool "custom target skeleton"
+	help
+	  Use custom target skeleton.
+
+endchoice
+
+if BR2_ROOTFS_SKELETON_CUSTOM
+config BR2_ROOTFS_SKELETON_CUSTOM_PATH
+	string "custom target skeleton path"
+	default "fs/skeleton"
+	help
+	  Path custom target skeleton.
+endif
+
 source "fs/cramfs/Config.in"
 source "fs/cloop/Config.in"
 source "fs/ext2/Config.in"
diff --git a/target/generic/target_busybox_skeleton/dev/.empty b/fs/skeleton/bin/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_busybox_skeleton/dev/.empty
+++ b/fs/skeleton/bin/.empty
diff --git a/target/generic/target_skeleton/dev/log b/fs/skeleton/dev/log
index d96b3b1cb..d96b3b1cb 120000
--- a/target/generic/target_skeleton/dev/log
+++ b/fs/skeleton/dev/log
diff --git a/target/generic/target_busybox_skeleton/proc/.empty b/fs/skeleton/dev/pts/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_busybox_skeleton/proc/.empty
+++ b/fs/skeleton/dev/pts/.empty
diff --git a/target/generic/target_busybox_skeleton/etc/TZ b/fs/skeleton/etc/TZ
index 9fcb2a3c5..9fcb2a3c5 100644
--- a/target/generic/target_busybox_skeleton/etc/TZ
+++ b/fs/skeleton/etc/TZ
diff --git a/target/generic/target_busybox_skeleton/etc/fstab b/fs/skeleton/etc/fstab
index 87d9da08e..87d9da08e 100644
--- a/target/generic/target_busybox_skeleton/etc/fstab
+++ b/fs/skeleton/etc/fstab
diff --git a/target/generic/target_skeleton/etc/group b/fs/skeleton/etc/group
index c600be08e..c600be08e 100644
--- a/target/generic/target_skeleton/etc/group
+++ b/fs/skeleton/etc/group
diff --git a/target/generic/target_busybox_skeleton/etc/hostname b/fs/skeleton/etc/hostname
index 5b26b355e..5b26b355e 100644
--- a/target/generic/target_busybox_skeleton/etc/hostname
+++ b/fs/skeleton/etc/hostname
diff --git a/target/generic/target_busybox_skeleton/etc/hosts b/fs/skeleton/etc/hosts
index ba712fe03..ba712fe03 100644
--- a/target/generic/target_busybox_skeleton/etc/hosts
+++ b/fs/skeleton/etc/hosts
diff --git a/target/generic/target_busybox_skeleton/etc/init.d/S20urandom b/fs/skeleton/etc/init.d/S20urandom
index f73cea59e..f73cea59e 100755
--- a/target/generic/target_busybox_skeleton/etc/init.d/S20urandom
+++ b/fs/skeleton/etc/init.d/S20urandom
diff --git a/target/generic/target_busybox_skeleton/etc/init.d/S40network b/fs/skeleton/etc/init.d/S40network
index ad6d250b5..ad6d250b5 100755
--- a/target/generic/target_busybox_skeleton/etc/init.d/S40network
+++ b/fs/skeleton/etc/init.d/S40network
diff --git a/target/generic/target_busybox_skeleton/etc/init.d/rcS b/fs/skeleton/etc/init.d/rcS
index de411534d..de411534d 100755
--- a/target/generic/target_busybox_skeleton/etc/init.d/rcS
+++ b/fs/skeleton/etc/init.d/rcS
diff --git a/target/generic/target_skeleton/etc/inittab b/fs/skeleton/etc/inittab
index 4be14b829..4be14b829 100644
--- a/target/generic/target_skeleton/etc/inittab
+++ b/fs/skeleton/etc/inittab
diff --git a/target/generic/target_busybox_skeleton/etc/inputrc b/fs/skeleton/etc/inputrc
index 2f1cb601a..2f1cb601a 100644
--- a/target/generic/target_busybox_skeleton/etc/inputrc
+++ b/fs/skeleton/etc/inputrc
diff --git a/target/generic/target_busybox_skeleton/etc/issue b/fs/skeleton/etc/issue
index 90f177983..90f177983 100644
--- a/target/generic/target_busybox_skeleton/etc/issue
+++ b/fs/skeleton/etc/issue
diff --git a/target/generic/target_busybox_skeleton/root/.empty b/fs/skeleton/etc/ld.so.conf.d/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_busybox_skeleton/root/.empty
+++ b/fs/skeleton/etc/ld.so.conf.d/.empty
diff --git a/target/generic/target_busybox_skeleton/etc/mtab b/fs/skeleton/etc/mtab
index e1c204547..e1c204547 120000
--- a/target/generic/target_busybox_skeleton/etc/mtab
+++ b/fs/skeleton/etc/mtab
diff --git a/target/generic/target_busybox_skeleton/etc/network/interfaces b/fs/skeleton/etc/network/interfaces
index 218b82cde..218b82cde 100644
--- a/target/generic/target_busybox_skeleton/etc/network/interfaces
+++ b/fs/skeleton/etc/network/interfaces
diff --git a/target/generic/target_busybox_skeleton/etc/passwd b/fs/skeleton/etc/passwd
index 377d4df5b..377d4df5b 100644
--- a/target/generic/target_busybox_skeleton/etc/passwd
+++ b/fs/skeleton/etc/passwd
diff --git a/target/generic/target_busybox_skeleton/etc/profile b/fs/skeleton/etc/profile
index cc2e0beb8..cc2e0beb8 100644
--- a/target/generic/target_busybox_skeleton/etc/profile
+++ b/fs/skeleton/etc/profile
diff --git a/target/generic/target_busybox_skeleton/etc/protocols b/fs/skeleton/etc/protocols
index 1ac8a4096..1ac8a4096 100644
--- a/target/generic/target_busybox_skeleton/etc/protocols
+++ b/fs/skeleton/etc/protocols
diff --git a/target/generic/target_busybox_skeleton/etc/random-seed b/fs/skeleton/etc/random-seed
index f26038adc..f26038adc 100644
--- a/target/generic/target_busybox_skeleton/etc/random-seed
+++ b/fs/skeleton/etc/random-seed
diff --git a/target/generic/target_busybox_skeleton/etc/resolv.conf b/fs/skeleton/etc/resolv.conf
index 71f6f9657..71f6f9657 120000
--- a/target/generic/target_busybox_skeleton/etc/resolv.conf
+++ b/fs/skeleton/etc/resolv.conf
diff --git a/target/generic/target_busybox_skeleton/etc/securetty b/fs/skeleton/etc/securetty
index b25f4a5a9..b25f4a5a9 100644
--- a/target/generic/target_busybox_skeleton/etc/securetty
+++ b/fs/skeleton/etc/securetty
diff --git a/target/generic/target_busybox_skeleton/etc/services b/fs/skeleton/etc/services
index b287b63ea..b287b63ea 100644
--- a/target/generic/target_busybox_skeleton/etc/services
+++ b/fs/skeleton/etc/services
diff --git a/target/generic/target_busybox_skeleton/etc/shadow b/fs/skeleton/etc/shadow
index 4941a1ac5..4941a1ac5 100644
--- a/target/generic/target_busybox_skeleton/etc/shadow
+++ b/fs/skeleton/etc/shadow
diff --git a/target/generic/target_busybox_skeleton/sys/.empty b/fs/skeleton/home/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_busybox_skeleton/sys/.empty
+++ b/fs/skeleton/home/.empty
diff --git a/target/generic/target_busybox_skeleton/tmp/.empty b/fs/skeleton/lib/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_busybox_skeleton/tmp/.empty
+++ b/fs/skeleton/lib/.empty
diff --git a/target/generic/target_busybox_skeleton/usr/sbin/.empty b/fs/skeleton/mnt/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_busybox_skeleton/usr/sbin/.empty
+++ b/fs/skeleton/mnt/.empty
diff --git a/target/generic/target_skeleton/bin/.empty b/fs/skeleton/opt/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_skeleton/bin/.empty
+++ b/fs/skeleton/opt/.empty
diff --git a/target/generic/target_skeleton/dev/pts/.empty b/fs/skeleton/proc/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_skeleton/dev/pts/.empty
+++ b/fs/skeleton/proc/.empty
diff --git a/target/generic/target_skeleton/root/.bash_history b/fs/skeleton/root/.bash_history
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_skeleton/root/.bash_history
+++ b/fs/skeleton/root/.bash_history
diff --git a/target/generic/target_skeleton/root/.bash_logout b/fs/skeleton/root/.bash_logout
index 77ef1f950..77ef1f950 100644
--- a/target/generic/target_skeleton/root/.bash_logout
+++ b/fs/skeleton/root/.bash_logout
diff --git a/target/generic/target_skeleton/root/.bash_profile b/fs/skeleton/root/.bash_profile
index 27bf14953..27bf14953 100644
--- a/target/generic/target_skeleton/root/.bash_profile
+++ b/fs/skeleton/root/.bash_profile
diff --git a/target/generic/target_skeleton/root/.bashrc b/fs/skeleton/root/.bashrc
index d13c8f902..d13c8f902 100644
--- a/target/generic/target_skeleton/root/.bashrc
+++ b/fs/skeleton/root/.bashrc
diff --git a/target/generic/target_skeleton/etc/ld.so.conf.d/.empty b/fs/skeleton/root/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_skeleton/etc/ld.so.conf.d/.empty
+++ b/fs/skeleton/root/.empty
diff --git a/target/generic/target_skeleton/home/.empty b/fs/skeleton/sbin/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_skeleton/home/.empty
+++ b/fs/skeleton/sbin/.empty
diff --git a/target/generic/target_skeleton/lib/.empty b/fs/skeleton/sys/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_skeleton/lib/.empty
+++ b/fs/skeleton/sys/.empty
diff --git a/target/generic/target_skeleton/mnt/.empty b/fs/skeleton/tmp/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_skeleton/mnt/.empty
+++ b/fs/skeleton/tmp/.empty
diff --git a/target/generic/target_skeleton/opt/.empty b/fs/skeleton/usr/bin/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_skeleton/opt/.empty
+++ b/fs/skeleton/usr/bin/.empty
diff --git a/target/generic/target_skeleton/proc/.empty b/fs/skeleton/usr/lib/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_skeleton/proc/.empty
+++ b/fs/skeleton/usr/lib/.empty
diff --git a/target/generic/target_skeleton/root/.empty b/fs/skeleton/usr/sbin/.empty
index e69de29bb..e69de29bb 100644
--- a/target/generic/target_skeleton/root/.empty
+++ b/fs/skeleton/usr/sbin/.empty
diff --git a/target/generic/target_skeleton/usr/share/udhcpc/default.script b/fs/skeleton/usr/share/udhcpc/default.script
index a52a7f812..a52a7f812 100755
--- a/target/generic/target_skeleton/usr/share/udhcpc/default.script
+++ b/fs/skeleton/usr/share/udhcpc/default.script
diff --git a/target/generic/target_busybox_skeleton/var/cache b/fs/skeleton/var/cache
index 1431b0e43..1431b0e43 120000
--- a/target/generic/target_busybox_skeleton/var/cache
+++ b/fs/skeleton/var/cache
diff --git a/target/generic/target_busybox_skeleton/var/lib/pcmcia b/fs/skeleton/var/lib/pcmcia
index f1fde8c10..f1fde8c10 120000
--- a/target/generic/target_busybox_skeleton/var/lib/pcmcia
+++ b/fs/skeleton/var/lib/pcmcia
diff --git a/target/generic/target_busybox_skeleton/var/lock b/fs/skeleton/var/lock
index 1431b0e43..1431b0e43 120000
--- a/target/generic/target_busybox_skeleton/var/lock
+++ b/fs/skeleton/var/lock
diff --git a/target/generic/target_busybox_skeleton/var/log b/fs/skeleton/var/log
index 1431b0e43..1431b0e43 120000
--- a/target/generic/target_busybox_skeleton/var/log
+++ b/fs/skeleton/var/log
diff --git a/target/generic/target_busybox_skeleton/var/pcmcia b/fs/skeleton/var/pcmcia
index 1431b0e43..1431b0e43 120000
--- a/target/generic/target_busybox_skeleton/var/pcmcia
+++ b/fs/skeleton/var/pcmcia
diff --git a/target/generic/target_busybox_skeleton/var/run b/fs/skeleton/var/run
index 1431b0e43..1431b0e43 120000
--- a/target/generic/target_busybox_skeleton/var/run
+++ b/fs/skeleton/var/run
diff --git a/target/generic/target_busybox_skeleton/var/spool b/fs/skeleton/var/spool
index 1431b0e43..1431b0e43 120000
--- a/target/generic/target_busybox_skeleton/var/spool
+++ b/fs/skeleton/var/spool
diff --git a/target/generic/target_busybox_skeleton/var/tmp b/fs/skeleton/var/tmp
index 1431b0e43..1431b0e43 120000
--- a/target/generic/target_busybox_skeleton/var/tmp
+++ b/fs/skeleton/var/tmp
diff --git a/linux/Config.in b/linux/Config.in
index d8a5157e2..948d71398 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -96,7 +96,7 @@ config BR2_LINUX_KERNEL_DEFCONFIG
 	string "Defconfig name"
 	depends on BR2_LINUX_KERNEL_USE_DEFCONFIG
 	help
-	 Name of the defconfig file to use, without the leading
+	 Name of the defconfig file to use, without the trailing
 	 _defconfig
 
 config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
diff --git a/package/Config.in b/package/Config.in
index eba21da0c..fe9693933 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -75,11 +75,11 @@ endmenu
 
 menu "Games"
 source "package/games/ace_of_penguins/Config.in"
-source "package/games/doom-wad/Config.in"
 source "package/games/gnuchess/Config.in"
-source "package/games/lxdoom/Config.in"
 source "package/games/magiccube4d/Config.in"
+source "package/games/lxdoom/Config.in"
 source "package/games/prboom/Config.in"
+source "package/games/doom-wad/Config.in"
 source "package/games/rubix/Config.in"
 endmenu
 
diff --git a/package/Makefile.in b/package/Makefile.in
index 189806d7b..1962466e2 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -127,10 +127,10 @@ TARGET_RANLIB   = $(TARGET_CROSS)ranlib
 TARGET_OBJCOPY  = $(TARGET_CROSS)objcopy
 TARGET_OBJDUMP  = $(TARGET_CROSS)objdump
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-TARGET_LDCONFIG = $(TARGET_CROSS)ldconfig
-else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
+ifeq ($(shell $(SHELL) -c "command -v $(TARGET_CROSS)ldconfig"),)
 TARGET_LDCONFIG = /sbin/ldconfig
+else
+TARGET_LDCONFIG = $(TARGET_CROSS)ldconfig
 endif
 
 ifeq ($(BR2_STRIP_strip),y)
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index c476de98d..d76b7913d 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -41,17 +41,17 @@ UPPERCASE = $(strip $(eval __tmp := $1) \
      $(__tmp))
 
 define KCONFIG_ENABLE_OPT
-       $(SED) "/$(1)/d" $(2)
+       $(SED) "/\\<$(1)\\>/d" $(2)
        echo "$(1)=y" >> $(2)
 endef
 
 define KCONFIG_SET_OPT
-       $(SED) "/$(1)/d" $(3)
+       $(SED) "/\\<$(1)\\>/d" $(3)
        echo "$(1)=$(2)" >> $(3)
 endef
 
 define KCONFIG_DISABLE_OPT
-       $(SED) "/$(1)/d" $(2)
+       $(SED) "/\\<$(1)\\>/d" $(2)
        echo "# $(1) is not set" >> $(2)
 endef
 
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index a513380b6..001640651 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -79,12 +79,6 @@ config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	  Show packages in menuconfig that are potentially also provided
 	  by busybox.
 
-config BR2_PACKAGE_BUSYBOX_SKELETON
-	bool "use minimal target skeleton"
-	help
-	  Use a minimal target skeleton. Make sure to select mdev
-	  which is used to populate /dev/.
-
 endif
 
 if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else
diff --git a/package/busybox/busybox-1.17.0/busybox-1.17.0-dos2unix.patch b/package/busybox/busybox-1.17.0/busybox-1.17.0-dos2unix.patch
new file mode 100644
index 000000000..dde59e046
--- /dev/null
+++ b/package/busybox/busybox-1.17.0/busybox-1.17.0-dos2unix.patch
@@ -0,0 +1,12 @@
+diff -urpN busybox-1.17.0/coreutils/dos2unix.c busybox-1.17.0-dos2unix/coreutils/dos2unix.c
+--- busybox-1.17.0/coreutils/dos2unix.c	2010-06-24 04:40:43.000000000 +0200
++++ busybox-1.17.0-dos2unix/coreutils/dos2unix.c	2010-07-17 22:40:21.021422169 +0200
+@@ -92,7 +92,7 @@ int dos2unix_main(int argc UNUSED_PARAM,
+ 	do {
+ 		/* might be convert(NULL) if there is no filename given */
+ 		convert(*argv, conv_type);
+-	} while (*++argv);
++	} while (*argv && *++argv);
+ 
+ 	return 0;
+ }
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 78bf21a40..d7b86cbd2 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -85,13 +85,6 @@ define BUSYBOX_PREFER_STATIC
 endef
 endif
 
-# Enable mdev for busybox skeleton
-ifeq ($(BR2_PACKAGE_BUSYBOX_SKELETON),y)
-define BUSYBOX_SKELETON
-	$(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG))
-endef
-endif
-
 # Disable usage of inetd if netkit-base package is selected
 ifeq ($(BR2_PACKAGE_NETKITBASE),y)
 define BUSYBOX_NETKITBASE
@@ -120,7 +113,6 @@ define BUSYBOX_CONFIGURE_CMDS
 	$(BUSYBOX_SET_IPV6)
 	$(BUSYBOX_SET_RPC)
 	$(BUSYBOX_PREFER_STATIC)
-	$(BUSYBOX_SKELETON)
 	$(BUSYBOX_NETKITBASE)
 	$(BUSYBOX_NETKITTELNET)
 	@yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \
diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
index caf273fbb..eeb237c5b 100644
--- a/package/dhcp/Config.in
+++ b/package/dhcp/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_ISC_DHCP
+config BR2_PACKAGE_DHCP
 	bool "DHCP support"
 	help
 	  DHCP relay agent from the ISC DHCP distribution.
@@ -7,21 +7,21 @@ config BR2_PACKAGE_ISC_DHCP
 
 config BR2_PACKAGE_DHCP_SERVER
 	bool "dhcp server"
-	depends on BR2_PACKAGE_ISC_DHCP
+	depends on BR2_PACKAGE_DHCP
 	help
 	  DHCP server from the ISC DHCP distribution.
 
 
 config BR2_PACKAGE_DHCP_RELAY
 	bool "dhcp relay"
-	depends on BR2_PACKAGE_ISC_DHCP
+	depends on BR2_PACKAGE_DHCP
 	help
 	  DHCP relay agent from the ISC DHCP distribution.
 
 
 config BR2_PACKAGE_DHCP_CLIENT
 	bool "dhcp client"
-	depends on BR2_PACKAGE_ISC_DHCP
+	depends on BR2_PACKAGE_DHCP
 	help
 	  DHCP client from the ISC DHCP distribution.
 
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 57e0a5dcd..bf3f775bd 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -3,108 +3,56 @@
 # dhcp
 #
 #############################################################
-DHCP_VERSION:=3.0.5
-DHCP_SOURCE:=dhcp-$(DHCP_VERSION).tar.gz
-DHCP_SITE:=ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history
-DHCP_CAT:=$(ZCAT)
-DHCP_DIR:=$(BUILD_DIR)/dhcp-$(DHCP_VERSION)
-DHCP_SERVER_BINARY:=work.linux-2.2/server/dhcpd
-DHCP_RELAY_BINARY:=work.linux-2.2/relay/dhcrelay
-DHCP_CLIENT_BINARY:=work.linux-2.2/client/dhclient
-DHCP_SERVER_TARGET_BINARY:=usr/sbin/dhcpd
-DHCP_RELAY_TARGET_BINARY:=usr/sbin/dhcrelay
-DHCP_CLIENT_TARGET_BINARY:=usr/sbin/dhclient
-BVARS=PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \
-	-D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\"' \
-	VARDB=/var/lib/dhcp
+DHCP_VERSION  = 4.1.1-P1
+DHCP_SOURCE   = dhcp-$(DHCP_VERSION).tar.gz
+DHCP_SITE     = http://ftp.isc.org/isc/dhcp/
+DHCP_CONF_ENV = ac_cv_file__dev_random=yes
+DHCP_CONF_OPT = \
+	--localstatedir=/var/lib/dhcp \
+	--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+	--with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
+	--with-srv-pid-file=/var/run/dhcpd.pid \
+	--with-cli-pid-file=/var/run/dhclient.pid \
+	--with-relay-pid-file=/var/run/dhcrelay.pid \
+	--disable-dhcpv6
 
-$(DL_DIR)/$(DHCP_SOURCE):
-	 $(call DOWNLOAD,$(DHCP_SITE),$(DHCP_SOURCE))
-
-dhcp-source: $(DL_DIR)/$(DHCP_SOURCE)
-
-dhcp_server-source: dhcp-source
-dhcp_relay-source: dhcp-source
-dhcp_client-source: dhcp-source
-
-$(DHCP_DIR)/.unpacked: $(DL_DIR)/$(DHCP_SOURCE)
-	$(DHCP_CAT) $(DL_DIR)/$(DHCP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(DHCP_DIR) package/dhcp/ dhcp\*.patch
-	touch $@
-
-$(DHCP_DIR)/.configured: $(DHCP_DIR)/.unpacked
-	(cd $(DHCP_DIR); \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure; \
-	)
-	touch $@
-
-$(DHCP_DIR)/$(DHCP_RELAY_BINARY): $(DHCP_DIR)/.configured
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(BVARS) -C $(DHCP_DIR)
-	$(STRIPCMD) $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
-
-$(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
+ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)
+define DHCP_INSTALL_SERVER
 	mkdir -p $(TARGET_DIR)/var/lib
-	(cd $(TARGET_DIR)/var/lib; \
-		ln -snf /tmp dhcp; \
-	)
-	$(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_SERVER_BINARY) \
-		$(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY)
-	mkdir -p $(TARGET_DIR)/etc/init.d
-	$(INSTALL) -m 0755 -D package/dhcp/S80dhcp-server \
-		$(TARGET_DIR)/etc/init.d
+	(cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
+	$(INSTALL) -m 0755 -D $(@D)/server/dhcpd $(TARGET_DIR)/usr/sbin/dhcpd
+	$(INSTALL) -m 0755 -D package/dhcp/S80dhcp-server $(TARGET_DIR)/etc/init.d
 	mkdir -p $(TARGET_DIR)/etc/dhcp
-	$(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf \
-		$(TARGET_DIR)/etc/dhcp/dhcpd.conf
-	rm -rf $(TARGET_DIR)/share/locale
+	$(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf $(TARGET_DIR)/etc/dhcp/dhcpd.conf
+endef
+endif
 
-$(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
+ifeq ($(BR2_PACKAGE_DHCP_RELAY),y)
+define DHCP_INSTALL_RELAY
 	mkdir -p $(TARGET_DIR)/var/lib
 	(cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
-	$(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_RELAY_BINARY) \
-		$(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY)
-	mkdir -p $(TARGET_DIR)/etc/init.d
-	$(INSTALL) -m 0755 -D package/dhcp/S80dhcp-relay \
-		$(TARGET_DIR)/etc/init.d
+	$(INSTALL) -m 0755 -D $(DHCP_DIR)/relay/dhcrelay $(TARGET_DIR)/usr/sbin/
+	$(INSTALL) -m 0755 -D package/dhcp/S80dhcp-relay $(TARGET_DIR)/etc/init.d
+endef
+endif
 
-$(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
+ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
+define DHCP_INSTALL_CLIENT
 	mkdir -p $(TARGET_DIR)/var/lib
 	(cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp)
-	$(INSTALL) -m 0755 -D $(DHCP_DIR)/$(DHCP_CLIENT_BINARY) \
-		$(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY)
+	$(INSTALL) -m 0755 -D $(DHCP_DIR)/client/dhclient $(TARGET_DIR)/usr/sbin
 	mkdir -p $(TARGET_DIR)/etc/dhcp
 	$(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \
 		$(TARGET_DIR)/etc/dhcp/dhclient.conf
 	$(INSTALL) -m 0755 -D package/dhcp/dhclient-script \
 		$(TARGET_DIR)/sbin/dhclient-script
+endef
+endif
 
-dhcp_server: $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY)
-
-dhcp_relay: $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY)
-
-dhcp_client: $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY)
-
-dhcp-clean:
-	-$(MAKE) -C $(DHCP_DIR) clean
-
-dhcp-dirclean:
-	rm -rf $(DHCP_DIR)
+define DHCP_INSTALL_TARGET_CMDS
+	$(DHCP_INSTALL_RELAY)
+	$(DHCP_INSTALL_SERVER)
+	$(DHCP_INSTALL_CLIENT)
+endef
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-#ifeq ($(BR2_PACKAGE_ISC_DHCP),y)
-#TARGETS+=dhcp
-#endif
-ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)
-TARGETS+=dhcp_server
-endif
-ifeq ($(BR2_PACKAGE_DHCP_RELAY),y)
-TARGETS+=dhcp_relay
-endif
-ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
-TARGETS+=dhcp_client
-endif
+$(eval $(call AUTOTARGETS,package,dhcp))
diff --git a/package/dhcp/dhcp_xecute.patch b/package/dhcp/dhcp_xecute.patch
deleted file mode 100644
index 0daff103f..000000000
--- a/package/dhcp/dhcp_xecute.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-diff -urN dhcp-3.0.2.orig/common/conflex.c dhcp-3.0.2/common/conflex.c
---- dhcp-3.0.2.orig/common/conflex.c	2004-11-24 10:39:15.000000000 -0700
-+++ dhcp-3.0.2/common/conflex.c	2005-02-24 12:32:12.000000000 -0700
-@@ -676,6 +676,8 @@
- 			return EVAL;
- 		if (!strcasecmp (atom + 1, "ncapsulate"))
- 			return ENCAPSULATE;
-+  if (!strcasecmp (atom + 1, "xecute"))
-+          return EXECUTE;
- 		break;
- 	      case 'f':
- 		if (!strcasecmp (atom + 1, "atal"))
-diff -urN dhcp-3.0.2.orig/common/dhcp-eval.5 dhcp-3.0.2/common/dhcp-eval.5
---- dhcp-3.0.2.orig/common/dhcp-eval.5	2005-01-19 13:00:52.000000000 -0700
-+++ dhcp-3.0.2/common/dhcp-eval.5	2005-02-24 12:32:12.000000000 -0700
-@@ -409,7 +409,32 @@
- Rebind - DHCP client is in the REBINDING state - it has an IP address,
- and is trying to contact any server to renew it.   The next message to
- be sent will be a DHCPREQUEST, which will be broadcast.
--.RE
-+.PP
-+.B execute (\fIcommand-path\fB, \fIdata-expr1\fB ... \fIdata-exprN\fB)\fR
-+.PP
-+External command execution is possibly through execute expressions. Execute
-+takes a variable number of arguments, where the first is the command
-+name (full path or only the name of the executable) and following zero
-+or more are data-expressions which values will be passed as external
-+arguments. It returns the return code of the external command.
-+.PP
-+Execute is synchronous, and the program will block until the external
-+command being run has finished. Please note that lengthy program
-+execution (for example, in an "on commit" in the dhcpd) may result in
-+bad performance and timed out clients. Try keeping the execution times
-+short.
-+.PP
-+Passing user-supplied data might be dangerous. Check input buffers
-+and make sure the external command handles all kinds of "unusual"
-+characters (shell special characters in sh-scripts etc) correctly.
-+.PP
-+It is possible to use the execute expression in any context, not only
-+on events. If you put it in a regular scope in the configuration file
-+you will execute that command every time a scope is evaluated.
-+.PP
-+The execute expression is only available if you have defined ENABLE_EXECUTE
-+in site.h before compilation.
-+RE
- .SH REFERENCE: LOGGING
- Logging statements may be used to send information to the standard logging
- channels.  A logging statement includes an optional priority (\fBfatal\fR,
-diff -urN dhcp-3.0.2.orig/common/parse.c dhcp-3.0.2/common/parse.c
---- dhcp-3.0.2.orig/common/parse.c	2004-09-30 14:38:31.000000000 -0600
-+++ dhcp-3.0.2/common/parse.c	2005-02-24 12:32:12.000000000 -0700
-@@ -3639,7 +3639,56 @@
- 			return 0;
- 		}
- 		break;
--	
-+  #ifdef ENABLE_EXECUTE
-+  case EXECUTE:
-+   token = next_token (&val, (unsigned *)0, cfile);
-+   
-+   if (!expression_allocate (expr, MDL))
-+    log_fatal ("can't allocate expression.");
-+   
-+   token = next_token (&val, (unsigned *)0, cfile);
-+   if (token != LPAREN) {
-+    parse_warn (cfile, "left parenthesis expected.");
-+    skip_to_semi (cfile);
-+    *lose = 1;
-+    return 0;
-+   }
-+   token = next_token (&val, (unsigned *)0, cfile);
-+   (*expr) -> data.funcall.name =
-+   dmalloc (strlen (val) + 1, MDL);
-+   if (!(*expr)->data.funcall.name)
-+    log_fatal ("can't allocate command name");
-+   strcpy ((*expr) -> data.funcall.name, val);
-+   token = next_token (&val, (unsigned *)0, cfile);
-+   ep = &((*expr) -> data.funcall.arglist);
-+   while (token == COMMA) {
-+    if (!expression_allocate (ep, MDL))
-+     log_fatal ("can't allocate expression");
-+    if (!parse_data_expression (&(*ep) -> data.arg.val,
-+    cfile, lose)) {
-+     skip_to_semi (cfile);
-+     *lose = 1;
-+    return 0;
-+    }
-+    ep = &((*ep) -> data.arg.next);
-+    token = next_token (&val, (unsigned *)0, cfile);
-+    }
-+   (*expr) -> op = expr_execute;
-+   if (token != RPAREN) {
-+    parse_warn (cfile, "right parenthesis expected.");
-+    skip_to_semi (cfile);
-+    *lose = 1;
-+    return 0;
-+   }
-+  break;
-+  #else
-+  case EXECUTE:
-+   parse_warn (cfile, "define ENABLE_EXECUTE in site.h to enable execute expressions.");
-+   skip_to_semi (cfile);
-+   *lose = 1;
-+   return 0;
-+  break;
-+  #endif
- 	      case ENCODE_INT:
- 		token = next_token (&val, (unsigned *)0, cfile);	
- 		token = next_token (&val, (unsigned *)0, cfile);
-diff -urN dhcp-3.0.2.orig/common/print.c dhcp-3.0.2/common/print.c
---- dhcp-3.0.2.orig/common/print.c	2004-06-17 14:54:39.000000000 -0600
-+++ dhcp-3.0.2/common/print.c	2005-02-24 12:32:12.000000000 -0700
-@@ -459,6 +459,7 @@
- {
- 	unsigned rv, left;
- 	const char *s;
-+ struct expression* next_arg;
- 	
- 	switch (expr -> op) {
- 	      case expr_none:
-@@ -483,7 +484,8 @@
- 			return rv;
- 		}
- 		break;
--
-+		
-+		
- 	      case expr_equal:
- 		if (len > 6) {
- 			rv = 4;
-@@ -1024,6 +1026,29 @@
- 			buf [rv++] = 0;
- 			return rv;
- 		}
-+  #ifdef ENABLE_EXECUTE
-+  case expr_execute:
-+   rv = 11 + strlen (expr -> data.funcall.name);
-+   if (len > rv + 2) {
-+    sprintf (buf,
-+    "(execute \"%s\"",
-+    expr -> data.funcall.name);
-+    for(next_arg = expr -> data.funcall.arglist;
-+    next_arg;
-+    next_arg = next_arg -> data.arg.next) {
-+     if (len > rv + 3)
-+      buf [rv++] = ' ';
-+     rv += print_subexpression (next_arg ->
-+     data.arg.val,
-+     buf + rv,
-+     len - rv - 2);
-+    }
-+    buf [rv++] = ')';
-+    buf [rv] = 0;
-+    return rv;
-+   }
-+  break;
-+  #endif
- 	}
- 	return 0;
- }
-diff -urN dhcp-3.0.2.orig/common/tree.c dhcp-3.0.2/common/tree.c
---- dhcp-3.0.2.orig/common/tree.c	2004-11-24 10:39:16.000000000 -0700
-+++ dhcp-3.0.2/common/tree.c	2005-02-24 12:32:12.000000000 -0700
-@@ -50,6 +50,113 @@
- int resolver_inited = 0;
- #endif
- 
-+#ifdef ENABLE_EXECUTE
-+static unsigned long execute (char** args)
-+{
-+pid_t p = fork();
-+if (p > 0) {
-+int status;
-+waitpid (p, &status, 0);
-+return WEXITSTATUS(status);
-+}
-+else if(p == 0) {
-+execvp (args[0], args);
-+log_error ("Unable to execute %s: %s", args[0],
-+strerror(errno));
-+_exit(127);
-+} else {
-+log_fatal ("unable to fork");
-+}
-+return 1; /* never reached */
-+}
-+
-+#define CAPACITY_INCREMENT 8
-+static void append_to_ary (char*** ary_ptr, int* ary_size, int* ary_capacity,
-+char* new_element)
-+{
-+(*ary_size)++;
-+if (*ary_size > *ary_capacity) {
-+char** new_ary;
-+int new_ary_capacity = *ary_capacity + CAPACITY_INCREMENT;
-+new_ary = dmalloc(new_ary_capacity*sizeof(char *), MDL);
-+if (!new_ary)
-+log_fatal ("no memory for array.");
-+if (*ary_ptr != NULL) {
-+memcpy (new_ary, *ary_ptr,
-+(*ary_capacity)*sizeof(char *));
-+dfree (*ary_ptr, MDL);
-+}
-+*ary_ptr = new_ary;
-+*ary_capacity = new_ary_capacity;
-+}
-+(*ary_ptr)[*ary_size-1] = new_element;
-+}
-+
-+static char* data_string_to_char_string (struct data_string* d)
-+{
-+char* str = dmalloc (d->len+1, MDL);
-+if (!str)
-+log_fatal ("no memory for string.");
-+/* FIXME: should one use d -> buffer -> data or d -> data? are
-+they equivalent? */
-+strncpy (str, d -> data, d -> len);
-+str[d->len] = '\0';
-+return str;
-+}
-+
-+static int evaluate_execute (unsigned long* result, struct packet *packet,
-+struct lease *lease,
-+struct client_state *client_state,
-+struct option_state *in_options,
-+struct option_state *cfg_options,
-+struct binding_scope **scope,
-+struct expression* expr)
-+{
-+int status;
-+int cmd_status;
-+int i;
-+struct data_string ds;
-+struct expression* next_arg;
-+char** arg_ary = NULL;
-+int arg_ary_size = 0;
-+int arg_ary_capacity = 0;
-+append_to_ary (&arg_ary, &arg_ary_size, &arg_ary_capacity,
-+ expr -> data.funcall.name);
-+for(next_arg = expr -> data.funcall.arglist;
-+next_arg;
-+next_arg = next_arg -> data.arg.next) {
-+memset (&ds, 0, sizeof ds);
-+status = (evaluate_data_expression
-+(&ds, packet,
-+lease, client_state, in_options,
-+cfg_options, scope,
-+next_arg -> data.arg.val,
-+MDL));
-+if (!status) {
-+if (arg_ary) {
-+for (i=1; i<arg_ary_size; i++)
-+dfree (arg_ary[i], MDL);
-+dfree(arg_ary, MDL);
-+}
-+return 0;
-+}
-+append_to_ary (&arg_ary, &arg_ary_size, &arg_ary_capacity,
-+ data_string_to_char_string(&ds));
-+data_string_forget (&ds, MDL);
-+}
-+#if defined (DEBUG_EXPRESSIONS)
-+log_debug ("exec: execute");
-+#endif
-+append_to_ary (&arg_ary, &arg_ary_size, &arg_ary_capacity, NULL);
-+*result = execute (arg_ary);
-+for (i=1; i<arg_ary_size-1; i++)
-+dfree (arg_ary[i], MDL);
-+dfree(arg_ary, MDL);
-+return 1;
-+}
-+#endif
-+ 
-+
- pair cons (car, cdr)
- 	caddr_t car;
- 	pair cdr;
-@@ -861,6 +968,9 @@
- 	      case expr_extract_int8:
- 	      case expr_extract_int16:
- 	      case expr_extract_int32:
-+       #ifdef ENABLE_EXECUTE
-+       case expr_execute:
-+       #endif
- 	      case expr_const_int:
- 	      case expr_lease_time:
- 	      case expr_dns_transaction:
-@@ -1224,6 +1334,9 @@
- 	      case expr_extract_int8:
- 	      case expr_extract_int16:
- 	      case expr_extract_int32:
-+       #ifdef ENABLE_EXECUTE
-+       case expr_execute:
-+       #endif
- 	      case expr_const_int:
- 	      case expr_lease_time:
- 	      case expr_dns_transaction:
-@@ -2087,6 +2200,9 @@
- 	      case expr_extract_int8:
- 	      case expr_extract_int16:
- 	      case expr_extract_int32:
-+       #ifdef ENABLE_EXECUTE
-+       case expr_execute:
-+       #endif
- 	      case expr_const_int:
- 	      case expr_lease_time:
- 	      case expr_dns_transaction:
-@@ -2595,7 +2711,12 @@
- #endif
- 			return 0;
- 		}
--
-+#ifdef ENABLE_EXECUTE
-+      case expr_execute:
-+      return evaluate_execute (result, packet, lease,
-+       client_state, in_options,
-+       cfg_options, scope, expr);
-+#endif
- 	      case expr_ns_add:
- 	      case expr_ns_delete:
- 	      case expr_ns_exists:
-@@ -3008,6 +3129,9 @@
- 	return (expr -> op == expr_extract_int8 ||
- 		expr -> op == expr_extract_int16 ||
- 		expr -> op == expr_extract_int32 ||
-+  #ifdef ENABLE_EXECUTE
-+   expr -> op == expr_execute ||
-+  #endif
- 		expr -> op == expr_const_int ||
- 		expr -> op == expr_lease_time ||
- 		expr -> op == expr_dns_transaction ||
-@@ -3043,6 +3167,9 @@
- 		expr -> op == expr_extract_int8 ||
- 		expr -> op == expr_extract_int16 ||
- 		expr -> op == expr_extract_int32 ||
-+  #ifdef ENABLE_EXECUTE
-+  expr -> op == expr_execute ||
-+  #endif
- 		expr -> op == expr_dns_transaction);
- }
- 
-@@ -3069,6 +3196,9 @@
- 	      case expr_extract_int8:
- 	      case expr_extract_int16:
- 	      case expr_extract_int32:
-+       #ifdef ENABLE_EXECUTE
-+             case expr_execute:
-+       #endif
- 	      case expr_encode_int8:
- 	      case expr_encode_int16:
- 	      case expr_encode_int32:
-@@ -3165,6 +3295,9 @@
- 	      case expr_extract_int8:
- 	      case expr_extract_int16:
- 	      case expr_extract_int32:
-+       #ifdef ENABLE_EXECUTE
-+       case expr_execute:
-+       #endif
- 	      case expr_encode_int8:
- 	      case expr_encode_int16:
- 	      case expr_encode_int32:
-@@ -3225,6 +3358,8 @@
- 	int firstp;
- {
- 	struct expression *e;
-+ struct expression* next_arg;
-+ 
- 	const char *s;
- 	char obuf [65];
- 	int scol;
-@@ -3696,7 +3831,27 @@
- 					  expr -> data.variable);
- 		col = token_print_indent (file, col, indent, "", "", ")");
- 		break;
--
-+  #ifdef ENABLE_EXECUTE
-+  case expr_execute:
-+   col = token_print_indent (file, col, indent, "", "","execute");
-+   col = token_print_indent (file, col, indent, " ", "","(");
-+   scol = col;
-+   /* FIXME: use token_print_indent_concat() here? */
-+   col = token_print_indent (file, col, scol, "", "","\"");
-+   col = token_print_indent (file, col, scol, "", "",expr -> data.funcall.name);
-+   col = token_print_indent (file, col, scol, "", "","\"");
-+   for(next_arg = expr -> data.funcall.arglist;
-+   next_arg;
-+   next_arg = next_arg -> data.arg.next) {
-+    col = token_print_indent (file, col, scol, "", " ",",");
-+    col = write_expression (file,
-+    next_arg -> data.arg.val,
-+    col, scol, 0);
-+   }
-+   col = token_print_indent (file, col, indent, "", "",")");
-+   
-+  break;
-+#endif
- 	      default:
- 		log_fatal ("invalid expression type in print_expression: %d",
- 			   expr -> op);
-@@ -3915,6 +4070,9 @@
- 	      case expr_extract_int8:
- 	      case expr_extract_int16:
- 	      case expr_extract_int32:
-+       #ifdef ENABLE_EXECUTE
-+       case expr_execute:
-+       #endif
- 	      case expr_encode_int8:
- 	      case expr_encode_int16:
- 	      case expr_encode_int32:
-diff -urN dhcp-3.0.2.orig/includes/dhctoken.h dhcp-3.0.2/includes/dhctoken.h
---- dhcp-3.0.2.orig/includes/dhctoken.h	2004-09-21 13:25:38.000000000 -0600
-+++ dhcp-3.0.2/includes/dhctoken.h	2005-02-24 12:33:21.000000000 -0700
-@@ -308,7 +308,8 @@
- 	DOMAIN_NAME = 613,
- 	DO_FORWARD_UPDATE = 614,
- 	KNOWN_CLIENTS = 615,
--	ATSFP = 616
-+	ATSFP = 616,
-+	EXECUTE = 616
- };
- 
- #define is_identifier(x)	((x) >= FIRST_TOKEN &&	\
-diff -urN dhcp-3.0.2.orig/includes/site.h dhcp-3.0.2/includes/site.h
---- dhcp-3.0.2.orig/includes/site.h	2002-03-12 11:33:39.000000000 -0700
-+++ dhcp-3.0.2/includes/site.h	2005-02-24 12:32:12.000000000 -0700
-@@ -167,6 +167,12 @@
- 
- /* #define DHCPD_LOG_FACILITY LOG_DAEMON */
- 
-+/* Define this if you want to be able to execute external commands
-+   during conditional evaluation. */
-+
-+/* #define ENABLE_EXECUTE */
-+
-+
- /* Define this if you aren't debugging and you want to save memory
-    (potentially a _lot_ of memory) by allocating leases in chunks rather
-    than one at a time. */
-diff -urN dhcp-3.0.2.orig/includes/tree.h dhcp-3.0.2/includes/tree.h
---- dhcp-3.0.2.orig/includes/tree.h	2004-06-10 11:59:31.000000000 -0600
-+++ dhcp-3.0.2/includes/tree.h	2005-02-24 12:32:12.000000000 -0700
-@@ -150,6 +150,9 @@
- 	expr_hardware,
- 	expr_packet,
- 	expr_const_data,
-+ #ifdef ENABLE_EXECUTE
-+ expr_execute,
-+ #endif
- 	expr_extract_int8,
- 	expr_extract_int16,
- 	expr_extract_int32,
diff --git a/package/mysql_client/mysql_client-5.1.47-ac_cache_check.patch b/package/mysql_client/mysql_client-5.1.47-ac_cache_check.patch
new file mode 100644
index 000000000..6bdfeaef3
--- /dev/null
+++ b/package/mysql_client/mysql_client-5.1.47-ac_cache_check.patch
@@ -0,0 +1,151 @@
+Patch borrowed from
+http://code.google.com/p/minimyth/source/browse/trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.47-ac_cache_check.patch?r=6493.
+
+It allows to override through ac_cv_* variables various checks that
+cannot be performed when cross-compiling.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+diff -Naur mysql-5.1.47-old/storage/innodb_plugin/plug.in mysql-5.1.47-new/storage/innodb_plugin/plug.in
+--- mysql-5.1.47-old/storage/innodb_plugin/plug.in	2010-05-20 09:55:10.000000000 -0700
++++ mysql-5.1.47-new/storage/innodb_plugin/plug.in	2010-05-20 09:56:12.000000000 -0700
+@@ -53,9 +53,10 @@
+   esac
+   AC_SUBST(INNODB_DYNAMIC_CFLAGS)
+ 
+-  AC_MSG_CHECKING(whether GCC atomic builtins are available)
++  AC_CACHE_CHECK([whether GCC atomic builtins are available],
++                 [ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS],
+   # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
+-  AC_TRY_RUN(
++  [AC_TRY_RUN(
+     [
+       int main()
+       {
+@@ -95,18 +96,23 @@
+       }
+     ],
+     [
+-      AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
+-                [GCC atomic builtins are available])
+       AC_MSG_RESULT(yes)
++      ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes
+     ],
+     [
+       AC_MSG_RESULT(no)
++      ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=no
+     ]
+-  )
++  )])
++  if test "x$ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS"= "xyes" ; then
++    AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
++              [GCC atomic builtins are available])
++  fi
+ 
+-  AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
++  AC_CACHE_CHECK([whether pthread_t can be used by GCC atomic builtins],
++                 [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC],
+   # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
+-  AC_TRY_RUN(
++  [AC_TRY_RUN(
+     [
+       #include <pthread.h>
+       #include <string.h>
+@@ -126,14 +132,18 @@
+       }
+     ],
+     [
+-      AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
+-                [pthread_t can be used by GCC atomic builtins])
+       AC_MSG_RESULT(yes)
++      ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes
+     ],
+     [
+       AC_MSG_RESULT(no)
++      ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=no
+     ]
+-  )
++  )])
++  if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC"= "xyes" ; then
++    AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
++              [pthread_t can be used by GCC atomic builtins])
++  fi
+ 
+   AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
+   # either define HAVE_IB_SOLARIS_ATOMICS or not
+@@ -147,9 +157,10 @@
+ 			    are available])
+   )
+ 
+-  AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
++  AC_CACHE_CHECK([whether pthread_t can be used by Solaris libc atomic functions],
++                 [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS],
+   # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
+-  AC_TRY_RUN(
++  [AC_TRY_RUN(
+     [
+       #include <pthread.h>
+       #include <string.h>
+@@ -180,28 +191,33 @@
+       }
+     ],
+     [
+-      AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1],
+-                [pthread_t can be used by solaris atomics])
+       AC_MSG_RESULT(yes)
++      ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=yes
+     ],
+     [
+       AC_MSG_RESULT(no)
++      ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no
+     ]
+-  )
++  )])
++  if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS"= "xyes" ; then
++    AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1],
++              [pthread_t can be used by solaris atomics])
++  fi
+ 
+   # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
+   # to use in the source
+   AC_CHECK_SIZEOF([pthread_t], [], [#include <pthread.h>])
+ 
+   # Check for x86 PAUSE instruction
+-  AC_MSG_CHECKING(for x86 PAUSE instruction)
++  AC_CACHE_CHECK([for x86 PAUSE instruction],
++                 [ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION],
+   # We have to actually try running the test program, because of a bug
+   # in Solaris on x86_64, where it wrongly reports that PAUSE is not
+   # supported when trying to run an application. See
+   # http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684
+   # We use ib_ prefix to avoid collisoins if this code is added to
+   # mysql's configure.in.
+-  AC_TRY_RUN(
++  [AC_TRY_RUN(
+     [
+       int main() {
+         __asm__ __volatile__ ("pause");
+@@ -209,16 +225,21 @@
+       }
+     ],
+     [
+-      AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist])
+       AC_MSG_RESULT(yes)
++      ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=yes
+     ],
+     [
+       AC_MSG_RESULT(no)
++      ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=no
+     ],
+     [
+       AC_MSG_RESULT(no)
++      ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=no
+     ]
+-  )
++  )])
++  if test "x$ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION"= "xyes" ; then
++    AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist])
++  fi
+   ])
+ 
+ # vim: set ft=config:
diff --git a/package/mysql_client/mysql_client-5.1.47-configure-ps-cache-check.patch b/package/mysql_client/mysql_client-5.1.47-configure-ps-cache-check.patch
new file mode 100644
index 000000000..d7bf6285e
--- /dev/null
+++ b/package/mysql_client/mysql_client-5.1.47-configure-ps-cache-check.patch
@@ -0,0 +1,35 @@
+Patch borrowed from
+http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/mysql/files/configure-ps-cache-check.patch
+
+It allows to specify through ac_cv_FIND_PROC how ps should be used on
+the target to find the PID of a program.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: mysql-4.1.22/configure.in
+===================================================================
+--- mysql-4.1.22.orig/configure.in	2009-01-28 16:33:28.000000000 +0000
++++ mysql-4.1.22/configure.in	2009-01-28 16:43:26.000000000 +0000
+@@ -471,8 +471,8 @@
+ 
+ # Lock for PS
+ AC_PATH_PROG(PS, ps, ps)
+-AC_MSG_CHECKING("how to check if pid exists")
+-PS=$ac_cv_path_PS
++AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC],
++[
+ # Linux style
+ if $PS p $$ 2> /dev/null | grep $0 > /dev/null
+ then
+@@ -511,8 +511,9 @@
+       AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
+   esac
+ fi
+-AC_SUBST(FIND_PROC)
+-AC_MSG_RESULT("$FIND_PROC")
++ac_cv_FIND_PROC="$FIND_PROC"
++])
++AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC])
+ 
+ # Check if a pid is valid
+ AC_PATH_PROG(KILL, kill, kill)
diff --git a/package/mysql_client/mysql_client-5.1.47-use-new-readline-iface.patch b/package/mysql_client/mysql_client-5.1.47-use-new-readline-iface.patch
new file mode 100644
index 000000000..34bc035e6
--- /dev/null
+++ b/package/mysql_client/mysql_client-5.1.47-use-new-readline-iface.patch
@@ -0,0 +1,17 @@
+Tell MySQL to use the new readline interface even when an external
+readline is being used.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: mysql_client-5.1.47/configure.in
+===================================================================
+--- mysql_client-5.1.47.orig/configure.in	2010-07-15 23:49:35.000000000 +0200
++++ mysql_client-5.1.47/configure.in	2010-07-15 23:50:03.000000000 +0200
+@@ -2700,6 +2700,7 @@
+ 	    # this way we avoid linking commercial source with GPL readline
+ 	    readline_link="-lreadline"
+ 	    want_to_use_readline="yes"
++	    AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)
+ 	elif [test "$mysql_cv_libedit_interface" = "yes"]
+ 	then
+ 	    # Use libedit
diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index 44036531e..377df89d8 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -3,23 +3,31 @@
 # MySQL 5.1 Client
 #
 #############################################################
-MYSQL_CLIENT_VERSION = 5.1.23-rc
+MYSQL_CLIENT_VERSION = 5.1.47
 MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
-MYSQL_CLIENT_SITE = http://mirrors.24-7-solutions.net/pub/mysql/Downloads/MySQL-5.1
+MYSQL_CLIENT_SITE = http://downloads.mysql.com/archives/mysql-5.1/
 MYSQL_CLIENT_INSTALL_TARGET = YES
 MYSQL_CLIENT_INSTALL_STAGING = YES
 MYSQL_CLIENT_DEPENDENCIES = readline ncurses
+MYSQL_CLIENT_AUTORECONF=YES
+
+MYSQL_CLIENT_CONF_ENV = \
+	ac_cv_sys_restartable_syscalls=yes \
+	ac_cv_path_PS=/bin/ps \
+	ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" \
+	ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes \
+	ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no \
+	ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes \
+	mysql_cv_new_rl_interface=yes
 
-MYSQL_CLIENT_CONF_ENV = ac_cv_sys_restartable_syscalls=yes
 MYSQL_CLIENT_CONF_OPT = \
 	--program-prefix="" \
 	--without-ndb-binlog \
 	--without-server \
 	--without-docs \
 	--without-man \
-	--without-readline \
 	--without-libedit \
-	--with-readline=$(STAGING_DIR)/usr \
+	--without-readline \
 	--with-low-memory \
 	--enable-thread-safe-client \
 	$(ENABLE_DEBUG)
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 87c753370..4fd3ad433 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -44,13 +44,22 @@ endif
 SDL_CONF_OPT += --enable-pulseaudio=no \
 		--disable-arts \
 		--disable-esd \
-		--disable-nasm
+		--disable-nasm \
+		--disable-video-ps3
 
-define SDL_POST_INSTALL_STAGING_HOOKS
-       $(SED) 's^libdir=\$${exec_prefix}^libdir=/usr^' \
-               $(STAGING_DIR)/usr/bin/sdl-config
+# Fixup prefix= and exec_prefix= in sdl-config, and remove the
+# -Wl,-rpath option.
+define SDL_FIXUP_SDL_CONFIG
+	$(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
+		$(STAGING_DIR)/usr/bin/sdl-config
+	$(SED) 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
+		$(STAGING_DIR)/usr/bin/sdl-config
+	$(SED) 's%-Wl,-rpath,\$${libdir}%%' \
+		$(STAGING_DIR)/usr/bin/sdl-config
 endef
 
+SDL_POST_INSTALL_STAGING_HOOKS+=SDL_FIXUP_SDL_CONFIG
+
 define SDL_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libSDL*.so* $(TARGET_DIR)/usr/lib/
 endef
diff --git a/target/device/Atmel/atstk1005/target_skeleton/etc/mtab b/target/device/Atmel/atstk1005/target_skeleton/etc/mtab
index e1c204547..e1c204547 100644..120000
--- a/target/device/Atmel/atstk1005/target_skeleton/etc/mtab
+++ b/target/device/Atmel/atstk1005/target_skeleton/etc/mtab
diff --git a/target/device/Atmel/atstk100x/target_skeleton/etc/mtab b/target/device/Atmel/atstk100x/target_skeleton/etc/mtab
index e1c204547..e1c204547 100644..120000
--- a/target/device/Atmel/atstk100x/target_skeleton/etc/mtab
+++ b/target/device/Atmel/atstk100x/target_skeleton/etc/mtab
diff --git a/target/generic/Makefile.in b/target/generic/Makefile.in
index 9a56f7604..1ef2a9d82 100644
--- a/target/generic/Makefile.in
+++ b/target/generic/Makefile.in
@@ -1,10 +1,3 @@
-# Default target skeleton stuff, may be overridden
-TARGET_SKELETON=target/generic/target_skeleton
-
-ifeq ($(BR2_PACKAGE_BUSYBOX_SKELETON),y)
-TARGET_SKELETON=target/generic/target_busybox_skeleton
-endif
-
 TARGET_GENERIC_HOSTNAME:=$(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
 TARGET_GENERIC_ISSUE:=$(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
 TARGET_GENERIC_GETTY:=$(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
diff --git a/target/generic/target_busybox_skeleton/etc/group b/target/generic/target_busybox_skeleton/etc/group
deleted file mode 100644
index f78c22cda..000000000
--- a/target/generic/target_busybox_skeleton/etc/group
+++ /dev/null
@@ -1,16 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-wheel:x:10:root
-utmp:x:43:
-staff:x:50:
-haldaemon:x:68:
-dbus:x:81:
-nobody:x:99:
-nogroup:x:99:
-users:x:100:
-default:x:1000:
diff --git a/target/generic/target_busybox_skeleton/etc/inittab b/target/generic/target_busybox_skeleton/etc/inittab
deleted file mode 100644
index bd3912b24..000000000
--- a/target/generic/target_busybox_skeleton/etc/inittab
+++ /dev/null
@@ -1,51 +0,0 @@
-# /etc/inittab
-#
-# Copyright (C) 2001 Erik Andersen <andersen@codepoet.org>
-#
-# Note: BusyBox init doesn't support runlevels.  The runlevels field is
-# completely ignored by BusyBox init. If you want runlevels, use
-# sysvinit.
-#
-# Format for each entry: <id>:<runlevels>:<action>:<process>
-#
-# id        == tty to run on, or empty for /dev/console
-# runlevels == ignored
-# action    == one of sysinit, respawn, askfirst, wait, and once
-# process   == program to run
-
-# Startup the system
-::sysinit:/bin/mount -t proc none /proc
-::sysinit:/bin/mount -t sysfs none /sys
-::sysinit:/bin/mount -t tmpfs -o size=64k,mode=0755 none /dev
-::sysinit:/bin/mkdir /dev/pts
-::sysinit:/bin/mount -t devpts devpts /dev/pts
-::sysinit:/bin/echo /sbin/mdev > /proc/sys/kernel/hotplug
-::sysinit:/sbin/mdev -s
-::sysinit:/bin/mount -o remount,rw /
-::sysinit:/bin/mount -a
-::sysinit:/bin/hostname -F /etc/hostname
-# now run any rc scripts
-::sysinit:/etc/init.d/rcS
-
-# Set up a couple of getty's
-tty1::respawn:/sbin/getty 38400 tty1
-tty2::respawn:/sbin/getty 38400 tty2
-
-# Put a getty on the serial port
-#ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL
-
-# Logging junk
-null::sysinit:/bin/touch /var/log/messages
-null::respawn:/sbin/syslogd -n
-null::respawn:/sbin/klogd -n
-tty3::respawn:/usr/bin/tail -f /var/log/messages
-
-# Stuff to do for the 3-finger salute
-::ctrlaltdel:/sbin/reboot
-
-# Stuff to do before rebooting
-null::shutdown:/usr/bin/killall klogd
-null::shutdown:/usr/bin/killall syslogd
-null::shutdown:/bin/umount -a -r
-null::shutdown:/sbin/swapoff -a
-
diff --git a/target/generic/target_skeleton/etc/TZ b/target/generic/target_skeleton/etc/TZ
deleted file mode 100644
index 9fcb2a3c5..000000000
--- a/target/generic/target_skeleton/etc/TZ
+++ /dev/null
@@ -1 +0,0 @@
-MST7MDT
diff --git a/target/generic/target_skeleton/etc/fstab b/target/generic/target_skeleton/etc/fstab
deleted file mode 100644
index 87d9da08e..000000000
--- a/target/generic/target_skeleton/etc/fstab
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/fstab: static file system information.
-#
-# <file system> <mount pt>     <type>	<options>         <dump> <pass>
-/dev/root       /              ext2	rw,noauto         0      1
-proc		/proc	       proc     defaults	  0	 0
-devpts		/dev/pts       devpts   defaults,gid=5,mode=620	  0	 0
-tmpfs           /tmp           tmpfs    defaults          0      0
-sysfs		/sys	       sysfs    defaults	  0	 0
diff --git a/target/generic/target_skeleton/etc/hostname b/target/generic/target_skeleton/etc/hostname
deleted file mode 100644
index 5b26b355e..000000000
--- a/target/generic/target_skeleton/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-buildroot
diff --git a/target/generic/target_skeleton/etc/hosts b/target/generic/target_skeleton/etc/hosts
deleted file mode 100644
index ba712fe03..000000000
--- a/target/generic/target_skeleton/etc/hosts
+++ /dev/null
@@ -1 +0,0 @@
-127.0.0.1	localhost
diff --git a/target/generic/target_skeleton/etc/init.d/S20urandom b/target/generic/target_skeleton/etc/init.d/S20urandom
deleted file mode 100755
index f73cea59e..000000000
--- a/target/generic/target_skeleton/etc/init.d/S20urandom
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-#
-# urandom	This script saves the random seed between reboots.
-#		It is called from the boot, halt and reboot scripts.
-#
-# Version:	@(#)urandom  1.33  22-Jun-1998  miquels@cistron.nl
-#
-
-[ -c /dev/urandom ] || exit 0
-#. /etc/default/rcS
-
-case "$1" in
-	start|"")
-		if [ "$VERBOSE" != no ]
-		then
-			echo -n "Initializing random number generator... "
-		fi
-		# Load and then save 512 bytes,
-		# which is the size of the entropy pool
-		if [ -f /etc/random-seed ]
-		then
-			cat /etc/random-seed >/dev/urandom
-		fi
-		# check for read only file system
-		if ! touch /etc/random-seed 2>/dev/null
-		then
-			echo "read-only file system detected...done"
-			exit
-		fi
-		rm -f /etc/random-seed
-		umask 077
-		dd if=/dev/urandom of=/etc/random-seed count=1 \
-			>/dev/null 2>&1 || echo "urandom start: failed."
-		umask 022
-		[ "$VERBOSE" != no ] && echo "done."
-		;;
-	stop)
-		if ! touch /etc/random-seed 2>/dev/null
-                then
-                        exit
-                fi
-		# Carry a random seed from shut-down to start-up;
-		# see documentation in linux/drivers/char/random.c
-		[ "$VERBOSE" != no ] && echo -n "Saving random seed... "
-		umask 077
-		dd if=/dev/urandom of=/etc/random-seed count=1 \
-			>/dev/null 2>&1 || echo "urandom stop: failed."
-		[ "$VERBOSE" != no ] && echo "done."
-		;;
-	*)
-		echo "Usage: urandom {start|stop}" >&2
-		exit 1
-		;;
-esac
diff --git a/target/generic/target_skeleton/etc/init.d/S40network b/target/generic/target_skeleton/etc/init.d/S40network
deleted file mode 100755
index ad6d250b5..000000000
--- a/target/generic/target_skeleton/etc/init.d/S40network
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# Start the network....
-#
-
-case "$1" in
-  start)
- 	echo "Starting network..."
-	/sbin/ifup -a
-	;;
-  stop)
-	echo -n "Stopping network..."
-	/sbin/ifdown -a
-	;;
-  restart|reload)
-	"$0" stop
-	"$0" start
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart}"
-	exit 1
-esac
-
-exit $?
-
diff --git a/target/generic/target_skeleton/etc/init.d/rcS b/target/generic/target_skeleton/etc/init.d/rcS
deleted file mode 100755
index de411534d..000000000
--- a/target/generic/target_skeleton/etc/init.d/rcS
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-
-# Start all init scripts in /etc/init.d
-# executing them in numerical order.
-#
-for i in /etc/init.d/S??* ;do
-
-     # Ignore dangling symlinks (if any).
-     [ ! -f "$i" ] && continue
-
-     case "$i" in
-	*.sh)
-	    # Source shell script for speed.
-	    (
-		trap - INT QUIT TSTP
-		set start
-		. $i
-	    )
-	    ;;
-	*)
-	    # No sh extension, so fork subprocess.
-	    $i start
-	    ;;
-    esac
-done
-
diff --git a/target/generic/target_skeleton/etc/inputrc b/target/generic/target_skeleton/etc/inputrc
deleted file mode 100644
index 2f1cb601a..000000000
--- a/target/generic/target_skeleton/etc/inputrc
+++ /dev/null
@@ -1,44 +0,0 @@
-# /etc/inputrc - global inputrc for libreadline
-# See readline(3readline) and `info readline' for more information.
-
-# Be 8 bit clean.
-set input-meta on
-set output-meta on
-set bell-style visible
-
-# To allow the use of 8bit-characters like the german umlauts, comment out
-# the line below. However this makes the meta key not work as a meta key,
-# which is annoying to those which don't need to type in 8-bit characters.
-
-# set convert-meta off
-
-"\e0d": backward-word
-"\e0c": forward-word
-"\e[h": beginning-of-line
-"\e[f": end-of-line
-"\e[1~": beginning-of-line
-"\e[4~": end-of-line
-#"\e[5~": beginning-of-history
-#"\e[6~": end-of-history
-"\e[3~": delete-char
-"\e[2~": quoted-insert
-
-# Common standard keypad and cursor
-# (codes courtsey Werner Fink, <werner@suse.de>)
-#"\e[1~": history-search-backward
-"\e[2~": yank
-"\e[3~": delete-char
-#"\e[4~": set-mark
-"\e[5~": history-search-backward
-"\e[6~": history-search-forward
-# Normal keypad and cursor of xterm
-"\e[F": end-of-line
-"\e[H": beginning-of-line
-# Application keypad and cursor of xterm
-"\eOA": previous-history
-"\eOC": forward-char
-"\eOB": next-history
-"\eOD": backward-char
-"\eOF": end-of-line
-"\eOH": beginning-of-line
-
diff --git a/target/generic/target_skeleton/etc/issue b/target/generic/target_skeleton/etc/issue
deleted file mode 100644
index 90f177983..000000000
--- a/target/generic/target_skeleton/etc/issue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Welcome to Buildroot
-
diff --git a/target/generic/target_skeleton/etc/mtab b/target/generic/target_skeleton/etc/mtab
deleted file mode 120000
index e1c204547..000000000
--- a/target/generic/target_skeleton/etc/mtab
+++ /dev/null
@@ -1 +0,0 @@
-../proc/mounts
\ No newline at end of file
diff --git a/target/generic/target_skeleton/etc/network/interfaces b/target/generic/target_skeleton/etc/network/interfaces
deleted file mode 100644
index 218b82cde..000000000
--- a/target/generic/target_skeleton/etc/network/interfaces
+++ /dev/null
@@ -1,4 +0,0 @@
-# Configure Loopback
-auto lo
-iface lo inet loopback
-
diff --git a/target/generic/target_skeleton/etc/passwd b/target/generic/target_skeleton/etc/passwd
deleted file mode 100644
index 377d4df5b..000000000
--- a/target/generic/target_skeleton/etc/passwd
+++ /dev/null
@@ -1,15 +0,0 @@
-root:x:0:0:root:/root:/bin/sh
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:100:sync:/bin:/bin/sync
-mail:x:8:8:mail:/var/spool/mail:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-operator:x:37:37:Operator:/var:/bin/sh
-haldaemon:x:68:68:hald:/:/bin/sh
-dbus:x:81:81:dbus:/var/run/dbus:/bin/sh
-nobody:x:99:99:nobody:/home:/bin/sh
-sshd:x:103:99:Operator:/var:/bin/sh
-default:x:1000:1000:Default non-root user:/home/default:/bin/sh
diff --git a/target/generic/target_skeleton/etc/profile b/target/generic/target_skeleton/etc/profile
deleted file mode 100644
index cc2e0beb8..000000000
--- a/target/generic/target_skeleton/etc/profile
+++ /dev/null
@@ -1,48 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login interactive shells.
-
-export PATH=\
-/bin:\
-/sbin:\
-/usr/bin:\
-/usr/sbin:\
-/usr/bin/X11:\
-/usr/local/bin
-
-# If running interactively, then:
-if [ "$PS1" ]; then
-
-    if [ "$BASH" ]; then
-	export PS1="[\u@\h \W]\\$ "
-	alias ll='/bin/ls --color=tty -laFh'
-	alias ls='/bin/ls --color=tty -F'
-	export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.png=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:';
-    else
-      if [ "`id -u`" -eq 0 ]; then 
-	export PS1='# '
-      else
-	export PS1='$ '
-      fi
-    fi
-
-    export USER=`id -un`
-    export LOGNAME=$USER
-    export HOSTNAME=`/bin/hostname`
-    export HISTSIZE=1000
-    export HISTFILESIZE=1000
-    export PAGER='/bin/more '
-    export EDITOR='/bin/vi'
-    export INPUTRC=/etc/inputrc
-    export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
-
-    ### Some aliases
-    alias ps2='ps facux '
-    alias ps1='ps faxo "%U %t %p %a" '
-    alias af='ps af'
-    alias cls='clear'
-    alias df='df -h'
-    alias indent='indent -bad -bap -bbo -nbc -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -cp33 -cs -d0 -di1 -nfc1 -nfca -hnl -i4 -ip0 -l75 -lp -npcs -npsl -nsc -nsob -nss -ts4 '
-    #alias bc='bc -l'
-    alias minicom='minicom -c on'
-    alias calc='calc -Cd '
-    alias bc='calc -Cd '
-fi;
diff --git a/target/generic/target_skeleton/etc/protocols b/target/generic/target_skeleton/etc/protocols
deleted file mode 100644
index 1ac8a4096..000000000
--- a/target/generic/target_skeleton/etc/protocols
+++ /dev/null
@@ -1,31 +0,0 @@
-# /etc/protocols:
-# $Id: protocols,v 1.1 2004/10/09 02:49:18 andersen Exp $
-#
-# Internet (IP) protocols
-#
-#	from: @(#)protocols	5.1 (Berkeley) 4/17/89
-#
-# Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992).
-
-ip	0	IP		# internet protocol, pseudo protocol number
-icmp	1	ICMP		# internet control message protocol
-igmp	2	IGMP		# Internet Group Management
-ggp	3	GGP		# gateway-gateway protocol
-ipencap	4	IP-ENCAP	# IP encapsulated in IP (officially ``IP'')
-st	5	ST		# ST datagram mode
-tcp	6	TCP		# transmission control protocol
-egp	8	EGP		# exterior gateway protocol
-pup	12	PUP		# PARC universal packet protocol
-udp	17	UDP		# user datagram protocol
-hmp	20	HMP		# host monitoring protocol
-xns-idp	22	XNS-IDP		# Xerox NS IDP
-rdp	27	RDP		# "reliable datagram" protocol
-iso-tp4	29	ISO-TP4		# ISO Transport Protocol class 4
-xtp	36	XTP		# Xpress Tranfer Protocol
-ddp	37	DDP		# Datagram Delivery Protocol
-idpr-cmtp	39	IDPR-CMTP	# IDPR Control Message Transport
-rspf	73	RSPF		#Radio Shortest Path First.
-vmtp	81	VMTP		# Versatile Message Transport
-ospf	89	OSPFIGP		# Open Shortest Path First IGP
-ipip	94	IPIP		# Yet Another IP encapsulation
-encap	98	ENCAP		# Yet Another IP encapsulation
diff --git a/target/generic/target_skeleton/etc/random-seed b/target/generic/target_skeleton/etc/random-seed
deleted file mode 100644
index f26038adc..000000000
--- a/target/generic/target_skeleton/etc/random-seed
+++ /dev/null
diff --git a/target/generic/target_skeleton/etc/resolv.conf b/target/generic/target_skeleton/etc/resolv.conf
deleted file mode 120000
index 71f6f9657..000000000
--- a/target/generic/target_skeleton/etc/resolv.conf
+++ /dev/null
@@ -1 +0,0 @@
-../tmp/resolv.conf
\ No newline at end of file
diff --git a/target/generic/target_skeleton/etc/securetty b/target/generic/target_skeleton/etc/securetty
deleted file mode 100644
index b25f4a5a9..000000000
--- a/target/generic/target_skeleton/etc/securetty
+++ /dev/null
@@ -1,35 +0,0 @@
-tty1
-tty2
-tty3
-tty4
-tty5
-tty6
-tty7
-tty8
-ttyS0
-ttyS1
-ttyS2
-ttyS3
-ttyAMA0
-ttyAMA1
-ttyAMA2
-ttyAMA3
-ttySAC0
-ttySAC1
-ttySAC2
-ttySAC3
-ttyUL0
-ttyUL1
-ttyUL2
-ttyUL3
-ttyPSC0
-ttyPSC1
-ttyPSC2
-ttyPSC3
-ttyCPM0
-ttyCPM1
-ttyCPM2
-ttyCPM3
-ttymxc0
-ttymxc1
-ttymxc2
diff --git a/target/generic/target_skeleton/etc/services b/target/generic/target_skeleton/etc/services
deleted file mode 100644
index b287b63ea..000000000
--- a/target/generic/target_skeleton/etc/services
+++ /dev/null
@@ -1,302 +0,0 @@
-# /etc/services:
-# $Id: services,v 1.1 2004/10/09 02:49:18 andersen Exp $
-#
-# Network services, Internet style
-#
-# Note that it is presently the policy of IANA to assign a single well-known
-# port number for both TCP and UDP; hence, most entries here have two entries
-# even if the protocol doesn't support UDP operations.
-# Updated from RFC 1700, ``Assigned Numbers'' (October 1994).  Not all ports
-# are included, only the more common ones.
-
-tcpmux		1/tcp				# TCP port service multiplexer
-echo		7/tcp
-echo		7/udp
-discard		9/tcp		sink null
-discard		9/udp		sink null
-systat		11/tcp		users
-daytime		13/tcp
-daytime		13/udp
-netstat		15/tcp
-qotd		17/tcp		quote
-msp		18/tcp				# message send protocol
-msp		18/udp				# message send protocol
-chargen		19/tcp		ttytst source
-chargen		19/udp		ttytst source
-ftp-data	20/tcp
-ftp		21/tcp
-fsp		21/udp		fspd
-ssh		22/tcp				# SSH Remote Login Protocol
-ssh		22/udp				# SSH Remote Login Protocol
-telnet		23/tcp
-# 24 - private
-smtp		25/tcp		mail
-# 26 - unassigned
-time		37/tcp		timserver
-time		37/udp		timserver
-rlp		39/udp		resource	# resource location
-nameserver	42/tcp		name		# IEN 116
-whois		43/tcp		nicname
-re-mail-ck	50/tcp				# Remote Mail Checking Protocol
-re-mail-ck	50/udp				# Remote Mail Checking Protocol
-domain		53/tcp		nameserver	# name-domain server
-domain		53/udp		nameserver
-mtp		57/tcp				# deprecated
-bootps		67/tcp				# BOOTP server
-bootps		67/udp
-bootpc		68/tcp				# BOOTP client
-bootpc		68/udp
-tftp		69/udp
-gopher		70/tcp				# Internet Gopher
-gopher		70/udp
-rje		77/tcp		netrjs
-finger		79/tcp
-www		80/tcp		http		# WorldWideWeb HTTP
-www		80/udp				# HyperText Transfer Protocol
-link		87/tcp		ttylink
-kerberos	88/tcp		kerberos5 krb5	# Kerberos v5
-kerberos	88/udp		kerberos5 krb5	# Kerberos v5
-supdup		95/tcp
-# 100 - reserved
-hostnames	101/tcp		hostname	# usually from sri-nic
-iso-tsap	102/tcp		tsap		# part of ISODE.
-csnet-ns	105/tcp		cso-ns		# also used by CSO name server
-csnet-ns	105/udp		cso-ns
-# unfortunately the poppassd (Eudora) uses a port which has already
-# been assigned to a different service. We list the poppassd as an
-# alias here. This should work for programs asking for this service.
-# (due to a bug in inetd the 3com-tsmux line is disabled)
-#3com-tsmux	106/tcp		poppassd
-#3com-tsmux	106/udp		poppassd
-rtelnet		107/tcp				# Remote Telnet
-rtelnet		107/udp
-pop-2		109/tcp		postoffice	# POP version 2
-pop-2		109/udp
-pop-3		110/tcp				# POP version 3
-pop-3		110/udp
-sunrpc		111/tcp		portmapper	# RPC 4.0 portmapper TCP
-sunrpc		111/udp		portmapper	# RPC 4.0 portmapper UDP
-auth		113/tcp		authentication tap ident
-sftp		115/tcp
-uucp-path	117/tcp
-nntp		119/tcp		readnews untp	# USENET News Transfer Protocol
-ntp		123/tcp
-ntp		123/udp				# Network Time Protocol
-netbios-ns	137/tcp				# NETBIOS Name Service
-netbios-ns	137/udp
-netbios-dgm	138/tcp				# NETBIOS Datagram Service
-netbios-dgm	138/udp
-netbios-ssn	139/tcp				# NETBIOS session service
-netbios-ssn	139/udp
-imap2		143/tcp				# Interim Mail Access Proto v2
-imap2		143/udp
-snmp		161/udp				# Simple Net Mgmt Proto
-snmp-trap	162/udp		snmptrap	# Traps for SNMP
-cmip-man	163/tcp				# ISO mgmt over IP (CMOT)
-cmip-man	163/udp
-cmip-agent	164/tcp
-cmip-agent	164/udp
-xdmcp		177/tcp				# X Display Mgr. Control Proto
-xdmcp		177/udp
-nextstep	178/tcp		NeXTStep NextStep	# NeXTStep window
-nextstep	178/udp		NeXTStep NextStep	# server
-bgp		179/tcp				# Border Gateway Proto.
-bgp		179/udp
-prospero	191/tcp				# Cliff Neuman's Prospero
-prospero	191/udp
-irc		194/tcp				# Internet Relay Chat
-irc		194/udp
-smux		199/tcp				# SNMP Unix Multiplexer
-smux		199/udp
-at-rtmp		201/tcp				# AppleTalk routing
-at-rtmp		201/udp
-at-nbp		202/tcp				# AppleTalk name binding
-at-nbp		202/udp
-at-echo		204/tcp				# AppleTalk echo
-at-echo		204/udp
-at-zis		206/tcp				# AppleTalk zone information
-at-zis		206/udp
-qmtp		209/tcp				# The Quick Mail Transfer Protocol
-qmtp		209/udp				# The Quick Mail Transfer Protocol
-z3950		210/tcp		wais		# NISO Z39.50 database
-z3950		210/udp		wais
-ipx		213/tcp				# IPX
-ipx		213/udp
-imap3		220/tcp				# Interactive Mail Access
-imap3		220/udp				# Protocol v3
-ulistserv	372/tcp				# UNIX Listserv
-ulistserv	372/udp
-https		443/tcp				# MCom
-https		443/udp				# MCom
-snpp		444/tcp				# Simple Network Paging Protocol
-snpp		444/udp				# Simple Network Paging Protocol
-saft		487/tcp				# Simple Asynchronous File Transfer
-saft		487/udp				# Simple Asynchronous File Transfer
-npmp-local	610/tcp		dqs313_qmaster	# npmp-local / DQS
-npmp-local	610/udp		dqs313_qmaster	# npmp-local / DQS
-npmp-gui	611/tcp		dqs313_execd	# npmp-gui / DQS
-npmp-gui	611/udp		dqs313_execd	# npmp-gui / DQS
-hmmp-ind	612/tcp		dqs313_intercell# HMMP Indication / DQS
-hmmp-ind	612/udp		dqs313_intercell# HMMP Indication / DQS
-#
-# UNIX specific services
-#
-exec		512/tcp
-biff		512/udp		comsat
-login		513/tcp
-who		513/udp		whod
-shell		514/tcp		cmd		# no passwords used
-syslog		514/udp
-printer		515/tcp		spooler		# line printer spooler
-talk		517/udp
-ntalk		518/udp
-route		520/udp		router routed	# RIP
-timed		525/udp		timeserver
-tempo		526/tcp		newdate
-courier		530/tcp		rpc
-conference	531/tcp		chat
-netnews		532/tcp		readnews
-netwall		533/udp				# -for emergency broadcasts
-uucp		540/tcp		uucpd		# uucp daemon
-afpovertcp	548/tcp				# AFP over TCP
-afpovertcp	548/udp				# AFP over TCP
-remotefs	556/tcp		rfs_server rfs	# Brunhoff remote filesystem
-klogin		543/tcp				# Kerberized `rlogin' (v5)
-kshell		544/tcp		krcmd		# Kerberized `rsh' (v5)
-kerberos-adm	749/tcp				# Kerberos `kadmin' (v5)
-#
-webster		765/tcp				# Network dictionary
-webster		765/udp
-#
-# From ``Assigned Numbers'':
-#
-#> The Registered Ports are not controlled by the IANA and on most systems
-#> can be used by ordinary user processes or programs executed by ordinary
-#> users.
-#
-#> Ports are used in the TCP [45,106] to name the ends of logical
-#> connections which carry long term conversations.  For the purpose of
-#> providing services to unknown callers, a service contact port is
-#> defined.  This list specifies the port used by the server process as its
-#> contact port.  While the IANA can not control uses of these ports it
-#> does register or list uses of these ports as a convienence to the
-#> community.
-#
-nfsdstatus	1110/tcp
-nfsd-keepalive	1110/udp
-
-ingreslock	1524/tcp
-ingreslock	1524/udp
-prospero-np	1525/tcp			# Prospero non-privileged
-prospero-np	1525/udp
-datametrics	1645/tcp	old-radius	# datametrics / old radius entry
-datametrics	1645/udp	old-radius	# datametrics / old radius entry
-sa-msg-port	1646/tcp	old-radacct	# sa-msg-port / old radacct entry
-sa-msg-port	1646/udp	old-radacct	# sa-msg-port / old radacct entry
-radius		1812/tcp			# Radius
-radius		1812/udp			# Radius
-radacct		1813/tcp			# Radius Accounting
-radacct		1813/udp			# Radius Accounting
-nfsd		2049/tcp	nfs
-nfsd		2049/udp	nfs
-cvspserver	2401/tcp			# CVS client/server operations
-cvspserver	2401/udp			# CVS client/server operations
-mysql		3306/tcp			# MySQL
-mysql		3306/udp			# MySQL
-rfe		5002/tcp			# Radio Free Ethernet
-rfe		5002/udp			# Actually uses UDP only
-cfengine	5308/tcp			# CFengine
-cfengine	5308/udp			# CFengine
-bbs		7000/tcp			# BBS service
-#
-#
-# Kerberos (Project Athena/MIT) services
-# Note that these are for Kerberos v4, and are unofficial.  Sites running
-# v4 should uncomment these and comment out the v5 entries above.
-#
-kerberos4	750/udp		kerberos-iv kdc	# Kerberos (server) udp
-kerberos4	750/tcp		kerberos-iv kdc	# Kerberos (server) tcp
-kerberos_master	751/udp				# Kerberos authentication
-kerberos_master	751/tcp				# Kerberos authentication
-passwd_server	752/udp				# Kerberos passwd server
-krb_prop	754/tcp				# Kerberos slave propagation
-krbupdate	760/tcp		kreg		# Kerberos registration
-kpasswd		761/tcp		kpwd		# Kerberos "passwd"
-kpop		1109/tcp			# Pop with Kerberos
-knetd		2053/tcp			# Kerberos de-multiplexor
-zephyr-srv	2102/udp			# Zephyr server
-zephyr-clt	2103/udp			# Zephyr serv-hm connection
-zephyr-hm	2104/udp			# Zephyr hostmanager
-eklogin		2105/tcp			# Kerberos encrypted rlogin
-#
-# Unofficial but necessary (for NetBSD) services
-#
-supfilesrv	871/tcp				# SUP server
-supfiledbg	1127/tcp			# SUP debugging
-#
-# Datagram Delivery Protocol services
-#
-rtmp		1/ddp				# Routing Table Maintenance Protocol
-nbp		2/ddp				# Name Binding Protocol
-echo		4/ddp				# AppleTalk Echo Protocol
-zip		6/ddp				# Zone Information Protocol
-#
-# Services added for the Debian GNU/Linux distribution
-poppassd	106/tcp				# Eudora
-poppassd	106/udp				# Eudora
-mailq		174/tcp				# Mailer transport queue for Zmailer
-mailq		174/tcp				# Mailer transport queue for Zmailer
-omirr		808/tcp		omirrd		# online mirror
-omirr		808/udp		omirrd		# online mirror
-rmtcfg		1236/tcp			# Gracilis Packeten remote config server
-xtel		1313/tcp			# french minitel
-coda_opcons	1355/udp			# Coda opcons            (Coda fs)
-coda_venus	1363/udp			# Coda venus             (Coda fs)
-coda_auth	1357/udp			# Coda auth              (Coda fs)
-coda_udpsrv	1359/udp			# Coda udpsrv            (Coda fs)
-coda_filesrv	1361/udp			# Coda filesrv           (Coda fs)
-codacon		1423/tcp	venus.cmu	# Coda Console           (Coda fs)
-coda_aux1	1431/tcp			# coda auxiliary service (Coda fs)
-coda_aux1	1431/udp			# coda auxiliary service (Coda fs)
-coda_aux2	1433/tcp			# coda auxiliary service (Coda fs)
-coda_aux2	1433/udp			# coda auxiliary service (Coda fs)
-coda_aux3	1435/tcp			# coda auxiliary service (Coda fs)
-coda_aux3	1435/udp			# coda auxiliary service (Coda fs)
-cfinger		2003/tcp			# GNU Finger
-afbackup	2988/tcp			# Afbackup system
-afbackup	2988/udp			# Afbackup system
-icp		3130/tcp			# Internet Cache Protocol (Squid)
-icp		3130/udp			# Internet Cache Protocol (Squid)
-postgres	5432/tcp			# POSTGRES
-postgres	5432/udp			# POSTGRES
-fax		4557/tcp			# FAX transmission service        (old)
-hylafax		4559/tcp			# HylaFAX client-server protocol  (new)
-noclog		5354/tcp			# noclogd with TCP (nocol)
-noclog		5354/udp			# noclogd with UDP (nocol)
-hostmon		5355/tcp			# hostmon uses TCP (nocol)
-hostmon		5355/udp			# hostmon uses TCP (nocol)
-ircd		6667/tcp			# Internet Relay Chat
-ircd		6667/udp			# Internet Relay Chat
-webcache	8080/tcp			# WWW caching service
-webcache	8080/udp			# WWW caching service
-tproxy		8081/tcp			# Transparent Proxy
-tproxy		8081/udp			# Transparent Proxy
-mandelspawn	9359/udp	mandelbrot	# network mandelbrot
-amanda		10080/udp			# amanda backup services
-amandaidx	10082/tcp			# amanda backup services
-amidxtape	10083/tcp			# amanda backup services
-isdnlog		20011/tcp			# isdn logging system
-isdnlog		20011/udp			# isdn logging system
-vboxd		20012/tcp			# voice box system
-vboxd		20012/udp			# voice box system
-binkp           24554/tcp			# Binkley
-binkp           24554/udp			# Binkley
-asp		27374/tcp			# Address Search Protocol
-asp		27374/udp			# Address Search Protocol
-tfido           60177/tcp			# Ifmail
-tfido           60177/udp			# Ifmail
-fido            60179/tcp			# Ifmail
-fido            60179/udp			# Ifmail
-
-# Local services
-
diff --git a/target/generic/target_skeleton/etc/shadow b/target/generic/target_skeleton/etc/shadow
deleted file mode 100644
index 4941a1ac5..000000000
--- a/target/generic/target_skeleton/etc/shadow
+++ /dev/null
@@ -1,12 +0,0 @@
-root::10933:0:99999:7:::
-bin:*:10933:0:99999:7:::
-daemon:*:10933:0:99999:7:::
-adm:*:10933:0:99999:7:::
-lp:*:10933:0:99999:7:::
-sync:*:10933:0:99999:7:::
-shutdown:*:10933:0:99999:7:::
-halt:*:10933:0:99999:7:::
-uucp:*:10933:0:99999:7:::
-operator:*:10933:0:99999:7:::
-nobody:*:10933:0:99999:7:::
-default::10933:0:99999:7:::
diff --git a/target/generic/target_skeleton/sbin/.empty b/target/generic/target_skeleton/sbin/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/target/generic/target_skeleton/sbin/.empty
+++ /dev/null
diff --git a/target/generic/target_skeleton/sys/.empty b/target/generic/target_skeleton/sys/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/target/generic/target_skeleton/sys/.empty
+++ /dev/null
diff --git a/target/generic/target_skeleton/tmp/.empty b/target/generic/target_skeleton/tmp/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/target/generic/target_skeleton/tmp/.empty
+++ /dev/null
diff --git a/target/generic/target_skeleton/usr/bin/.empty b/target/generic/target_skeleton/usr/bin/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/target/generic/target_skeleton/usr/bin/.empty
+++ /dev/null
diff --git a/target/generic/target_skeleton/usr/lib/.empty b/target/generic/target_skeleton/usr/lib/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/target/generic/target_skeleton/usr/lib/.empty
+++ /dev/null
diff --git a/target/generic/target_skeleton/usr/sbin/.empty b/target/generic/target_skeleton/usr/sbin/.empty
deleted file mode 100644
index e69de29bb..000000000
--- a/target/generic/target_skeleton/usr/sbin/.empty
+++ /dev/null
diff --git a/target/generic/target_skeleton/var/cache b/target/generic/target_skeleton/var/cache
deleted file mode 120000
index 1431b0e43..000000000
--- a/target/generic/target_skeleton/var/cache
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file
diff --git a/target/generic/target_skeleton/var/lib/pcmcia b/target/generic/target_skeleton/var/lib/pcmcia
deleted file mode 120000
index f1fde8c10..000000000
--- a/target/generic/target_skeleton/var/lib/pcmcia
+++ /dev/null
@@ -1 +0,0 @@
-../../tmp
\ No newline at end of file
diff --git a/target/generic/target_skeleton/var/lock b/target/generic/target_skeleton/var/lock
deleted file mode 120000
index 1431b0e43..000000000
--- a/target/generic/target_skeleton/var/lock
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file
diff --git a/target/generic/target_skeleton/var/log b/target/generic/target_skeleton/var/log
deleted file mode 120000
index 1431b0e43..000000000
--- a/target/generic/target_skeleton/var/log
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file
diff --git a/target/generic/target_skeleton/var/pcmcia b/target/generic/target_skeleton/var/pcmcia
deleted file mode 120000
index 1431b0e43..000000000
--- a/target/generic/target_skeleton/var/pcmcia
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file
diff --git a/target/generic/target_skeleton/var/run b/target/generic/target_skeleton/var/run
deleted file mode 120000
index 1431b0e43..000000000
--- a/target/generic/target_skeleton/var/run
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file
diff --git a/target/generic/target_skeleton/var/spool b/target/generic/target_skeleton/var/spool
deleted file mode 120000
index 1431b0e43..000000000
--- a/target/generic/target_skeleton/var/spool
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file
diff --git a/target/generic/target_skeleton/var/tmp b/target/generic/target_skeleton/var/tmp
deleted file mode 120000
index 1431b0e43..000000000
--- a/target/generic/target_skeleton/var/tmp
+++ /dev/null
@@ -1 +0,0 @@
-../tmp
\ No newline at end of file