diff --git a/config/path b/config/path
index b395605cc6..e07928399a 100644
--- a/config/path
+++ b/config/path
@@ -13,16 +13,6 @@ case $TARGET_ARCH in
     ;;
 esac
 
-case $TARGET_LIBC in
-  uClibc)
-    TARGET_NAME=$TARGET_FAMILY-openelec-linux-uclibc
-    ;;
-
-  eglibc)
-    TARGET_NAME=$TARGET_FAMILY-openelec-linux-gnu
-    ;;
-esac
-
 # determines TARGET_CPU, if not forced by user
 if [ -z "$TARGET_CPU" ]; then
   case $TARGET_ARCH in
@@ -36,13 +26,15 @@ if [ -z "$TARGET_CPU" ]; then
   esac
 fi
 
+TARGET_NAME=$TARGET_FAMILY-openelec-linux-gnu
+
 OPENELEC_VERSION=`cat VERSION`
 CONFIG=config
 SCRIPTS=scripts
 PACKAGES=packages
 SOURCES=sources
 BUILD_BASE=build
-BUILD=$BUILD_BASE.OpenELEC-$PROJECT.$TARGET_ARCH-$TARGET_LIBC.$OPENELEC_VERSION
+BUILD=$BUILD_BASE.OpenELEC-$PROJECT.$TARGET_ARCH.$OPENELEC_VERSION
 [ -n "$TARGET_PLATFORM" ] && BUILD=$BUILD.$TARGET_PLATFORM
 PKG_BUILD=$BUILD/$1\[-_][0-9]*
 #PKG_DIR=`find $PACKAGES -type d -name $1 -not -regex ".*cinit.*"`
diff --git a/packages/image/install b/packages/image/install
index 952f1bde3a..2e4d993ef9 100755
--- a/packages/image/install
+++ b/packages/image/install
@@ -10,7 +10,7 @@ BZR_BUILD=`bzr version-info --custom --template={revno}`
 [ "$OPENELEC_VERSION" = devel -o "$OPENELEC_VERSION" = debug ] && \
   OPENELEC_VERSION=$OPENELEC_VERSION-$BUILD_DATE-r$BZR_BUILD
 
-TARGET_VERSION="$PROJECT-$TARGET_LIBC-$OPENELEC_VERSION"
+TARGET_VERSION="$PROJECT-$OPENELEC_VERSION"
 
 case "$2" in
   system)
@@ -45,7 +45,7 @@ case "$2" in
     ln -sf /var/media $INSTALL/media
 
 # Basissystem...
-    $SCRIPTS/install $TARGET_LIBC
+    $SCRIPTS/install eglibc
     $SCRIPTS/install gcc-final
     $SCRIPTS/install linux $2
     $SCRIPTS/install busybox
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index b1e098e0f6..92c3630566 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -61,9 +61,6 @@ $SCRIPTS/install samba
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
-XBMC_TARGET_SYSTEM="linux"
-[ $TARGET_LIBC = "uClibc" ] && XBMC_TARGET_SYSTEM="uclibc"
-
 mkdir -p $INSTALL/usr/bin
   ln -s /usr/share/xbmc/xbmc.bin $INSTALL/usr/bin/xbmc
 
@@ -96,7 +93,7 @@ mkdir -p $INSTALL/usr/share/xbmc/sounds
 
 mkdir -p $INSTALL/usr/share/xbmc/system
 
-  cp -PR $PKG_BUILD/system/*$XBMC_TARGET_SYSTEM.so $INSTALL/usr/share/xbmc/system
+  cp -PR $PKG_BUILD/system/*linux.so $INSTALL/usr/share/xbmc/system
   cp -PR $PKG_BUILD/system/*.xml $INSTALL/usr/share/xbmc/system
   cp -PR $PKG_BUILD/system/*.conf $INSTALL/usr/share/xbmc/system
 
diff --git a/packages/toolchain/build b/packages/toolchain/build
index 815f2af5a5..65efa64730 100755
--- a/packages/toolchain/build
+++ b/packages/toolchain/build
@@ -11,7 +11,7 @@ $SCRIPTS/build intltool
 
 $SCRIPTS/install binutils
 $SCRIPTS/install gcc-core
-$SCRIPTS/install $TARGET_LIBC toolchain
+$SCRIPTS/install eglibc toolchain
 
 if [ "c" != "$TOOLCHAIN_LANGUAGES" ]; then
   $SCRIPTS/install gcc-final toolchain
diff --git a/packages/toolchain/lang/gcc-final/build b/packages/toolchain/lang/gcc-final/build
index 6b747f36ef..722c42d144 100755
--- a/packages/toolchain/lang/gcc-final/build
+++ b/packages/toolchain/lang/gcc-final/build
@@ -4,14 +4,11 @@
 
 $SCRIPTS/install ccache toolchain
 $SCRIPTS/install binutils
-$SCRIPTS/install $TARGET_LIBC toolchain
+$SCRIPTS/install eglibc toolchain
 $SCRIPTS/unpack gcc
 
 setup_toolchain host
 
-TLS_CONFIG="--enable-tls"
-[ $TARGET_LIBC = "uClibc" ] && TLS_CONFIG="--disable-tls"
-
 cd $BUILD/gcc*
 mkdir -p objdir-$1
 cd objdir-$1
@@ -28,7 +25,7 @@ cd objdir-$1
              --disable-libmudflap \
              --disable-libssp \
              --disable-multilib \
-             $TLS_CONFIG \
+             --enable-tls \
              --enable-shared \
              --enable-c99 \
              --enable-long-long \