diff --git a/packages/devel/eglibc/config/gai.conf b/packages/devel/glibc/config/gai.conf
similarity index 100%
rename from packages/devel/eglibc/config/gai.conf
rename to packages/devel/glibc/config/gai.conf
diff --git a/packages/devel/eglibc/config/host.conf b/packages/devel/glibc/config/host.conf
similarity index 100%
rename from packages/devel/eglibc/config/host.conf
rename to packages/devel/glibc/config/host.conf
diff --git a/packages/devel/eglibc/config/nsswitch.conf b/packages/devel/glibc/config/nsswitch.conf
similarity index 100%
rename from packages/devel/eglibc/config/nsswitch.conf
rename to packages/devel/glibc/config/nsswitch.conf
diff --git a/packages/devel/eglibc/package.mk b/packages/devel/glibc/package.mk
similarity index 68%
rename from packages/devel/eglibc/package.mk
rename to packages/devel/glibc/package.mk
index 782a353698..c20cc5b011 100644
--- a/packages/devel/eglibc/package.mk
+++ b/packages/devel/glibc/package.mk
@@ -16,25 +16,25 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="eglibc"
-PKG_VERSION="2.19-25249"
+PKG_NAME="glibc"
+PKG_VERSION="2.19"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.eglibc.org/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_SITE="http://www.gnu.org/software/libc/"
+PKG_URL="ftp://ftp.gnu.org/pub/gnu/glibc/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="ccache:host autotools:host autoconf:host linux:host gcc:bootstrap"
-PKG_DEPENDS_INIT="eglibc"
+PKG_DEPENDS_INIT="glibc"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
-PKG_SHORTDESC="eglibc: The Embedded GNU C library"
-PKG_LONGDESC="The Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC) that is designed to work well on embedded systems. EGLIBC strives to be source and binary compatible with GLIBC. EGLIBC's goals include reduced footprint, configurable components, better support for cross-compilation and cross-testing. In contrast to what Ulrich Drepper makes out of GLIBC, in EGLIBC all patches assigned to the FSF will be considered regardless of individual or company affiliation and cooperation is encouraged, as well as communication, civility, and respect among developers."
+PKG_SHORTDESC="glibc: The GNU C library"
+PKG_LONGDESC="The Glibc package contains the main C library. This library provides the basic routines for allocating memory, searching directories, opening and closing files, reading and writing files, string handling, pattern matching, arithmetic, and so on."
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="BASH_SHELL=/bin/sh \
-                           --libexecdir=/usr/lib/eglibc \
+                           --libexecdir=/usr/lib/glibc \
                            --cache-file=config.cache \
                            --disable-profile \
                            --disable-sanity-checks \
@@ -57,15 +57,14 @@ if [ "$DEBUG" = yes ]; then
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-debug"
 else
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-debug"
-  DEBUG_OPTIONS="  OPTION_EGLIBC_MEMUSAGE = n"
 fi
 
 NSS_CONF_DIR="$PKG_BUILD/nss"
 
-EGLIBC_EXCLUDE_BIN="catchsegv getconf iconv iconvconfig ldconfig lddlibc4"
-EGLIBC_EXCLUDE_BIN="$EGLIBC_EXCLUDE_BIN localedef makedb mtrace pcprofiledump"
-EGLIBC_EXCLUDE_BIN="$EGLIBC_EXCLUDE_BIN pldd rpcgen sln sotruss sprof tzselect"
-EGLIBC_EXCLUDE_BIN="$EGLIBC_EXCLUDE_BIN xtrace zdump zic"
+GLIBC_EXCLUDE_BIN="catchsegv gencat getconf iconv iconvconfig ldconfig lddlibc4"
+GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN localedef makedb mtrace pcprofiledump"
+GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN pldd rpcgen sln sotruss sprof tzselect"
+GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN xtrace zdump zic"
 
 pre_build_target() {
   cd $PKG_BUILD
@@ -78,7 +77,7 @@ pre_configure_target() {
 # Fails to compile with GCC's link time optimization.
   strip_lto
 
-# eglibc dont support GOLD linker.
+# glibc dont support GOLD linker.
   strip_gold
 
 # Filter out some problematic *FLAGS
@@ -103,49 +102,6 @@ pre_configure_target() {
   export BUILD_CC=$HOST_CC
   export OBJDUMP_FOR_HOST=objdump
 
-# create configuration
-cat >option-groups.config <<EOF
-
-  OPTION_EGLIBC_ADVANCED_INET6 = n
-
-# needed for connman:
-  OPTION_EGLIBC_BACKTRACE = y
-
-  OPTION_EGLIBC_BIG_MACROS = n
-  OPTION_EGLIBC_BSD = n
-  OPTION_EGLIBC_CATGETS = n
-
-# libiconv replacement:
-  OPTION_EGLIBC_CHARSETS = y
-
-  OPTION_EGLIBC_DB_ALIASES = n
-  OPTION_EGLIBC_LOCALES = n
-
-# needed for example with glib and Python:
-  OPTION_EGLIBC_LOCALE_CODE = y
-
-# activeperl fails without libnsl. keep it enabled for now
-  OPTION_EGLIBC_NIS = y
-  OPTION_EGLIBC_NSSWITCH = y
-  OPTION_EGLIBC_RCMD = n
-
-# needed by eglibc byself (todo):
-  OPTION_EGLIBC_RTLD_DEBUG = y
-
-# needed for speed (optionally/todo)
-  OPTION_POSIX_REGEXP_GLIBC = y
-
-# needed for PAM and Mysql:
-  OPTION_EGLIBC_GETLOGIN = y
-
-# needed for systemd and dropbear:
-  OPTION_EGLIBC_UTMP = y
-  OPTION_EGLIBC_UTMPX = y
-
-# debugging options:
-  $DEBUG_OPTIONS
-EOF
-
 cat >config.cache <<EOF
 ac_cv_header_cpuid_h=yes
 libc_cv_forced_unwind=yes
@@ -166,16 +122,23 @@ post_makeinstall_target() {
   ln -sf $(basename $INSTALL/lib/ld-*.so) $INSTALL/lib/ld.so
 
 # cleanup
-  for i in $EGLIBC_EXCLUDE_BIN; do
+  for i in $GLIBC_EXCLUDE_BIN; do
     rm -rf $INSTALL/usr/bin/$i
   done
   rm -rf $INSTALL/usr/lib/audit
-  rm -rf $INSTALL/usr/lib/eglibc
+  rm -rf $INSTALL/usr/lib/glibc
   rm -rf $INSTALL/usr/lib/libc_pic
   rm -rf $INSTALL/usr/lib/*.o
   rm -rf $INSTALL/usr/lib/*.map
   rm -rf $INSTALL/var
 
+# remove locales and charmaps
+  rm -rf $INSTALL/usr/share/i18n/charmaps
+  rm -rf $INSTALL/usr/share/i18n/locales
+
+  mkdir -p $INSTALL/usr/share/i18n/locales
+    cp -PR $ROOT/$PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales
+
 # create default configs
   mkdir -p $INSTALL/etc
     cp $PKG_DIR/config/nsswitch.conf $INSTALL/etc
diff --git a/packages/devel/eglibc/patches/eglibc-allow-newer-autoconf.patch b/packages/devel/glibc/patches/glibc-allow-newer-autoconf.patch
similarity index 100%
rename from packages/devel/eglibc/patches/eglibc-allow-newer-autoconf.patch
rename to packages/devel/glibc/patches/glibc-allow-newer-autoconf.patch
diff --git a/packages/devel/eglibc/patches/eglibc-fix-dns-with-broken-routers.patch b/packages/devel/glibc/patches/glibc-fix-dns-with-broken-routers.patch
similarity index 100%
rename from packages/devel/eglibc/patches/eglibc-fix-dns-with-broken-routers.patch
rename to packages/devel/glibc/patches/glibc-fix-dns-with-broken-routers.patch
diff --git a/packages/devel/eglibc/patches/eglibc-select_fd_type.patch b/packages/devel/glibc/patches/glibc-select_fd_type.patch
similarity index 100%
rename from packages/devel/eglibc/patches/eglibc-select_fd_type.patch
rename to packages/devel/glibc/patches/glibc-select_fd_type.patch
diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index 2c1448baa2..4a3fafb30f 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -25,7 +25,7 @@ PKG_SITE="http://gcc.gnu.org/"
 PKG_URL="ftp://ftp.gnu.org/gnu/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host"
 PKG_DEPENDS_TARGET="gcc:host"
-PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host eglibc"
+PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host cloog:host ppl:host glibc"
 PKG_PRIORITY="optional"
 PKG_SECTION="lang"
 PKG_SHORTDESC="gcc: The GNU Compiler Collection Version 4 (aka GNU C Compiler)"
diff --git a/packages/virtual/libc/package.mk b/packages/virtual/libc/package.mk
index 8518399e24..4559414e47 100644
--- a/packages/virtual/libc/package.mk
+++ b/packages/virtual/libc/package.mk
@@ -23,8 +23,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain eglibc timezone-data"
-PKG_DEPENDS_INIT="toolchain eglibc:init"
+PKG_DEPENDS_TARGET="toolchain glibc timezone-data"
+PKG_DEPENDS_INIT="toolchain glibc:init"
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="libc: Metapackage"