diff --git a/packages/addons/service/locale/package.mk b/packages/addons/service/locale/package.mk
index e3c8f05bc3..edb718e256 100644
--- a/packages/addons/service/locale/package.mk
+++ b/packages/addons/service/locale/package.mk
@@ -16,12 +16,12 @@ PKG_ADDON_TYPE="xbmc.service"
 
 addon() {
   mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin"
-  cp -PR "$(get_build_dir glibc)/.$TARGET_NAME/locale/localedef" \
+  cp -PR "$(get_install_dir glibc)/.noinstall/localedef" \
          "$ADDON_BUILD/$PKG_ADDON_ID/bin"
 
   mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/i18n"
-  cp -PR "$(get_build_dir glibc)/localedata/charmaps" \
-         "$(get_build_dir glibc)/localedata/locales" \
+  cp -PR "$(get_install_dir glibc)/.noinstall/charmaps" \
+         "$(get_install_dir glibc)/.noinstall/locales" \
          "$ADDON_BUILD/$PKG_ADDON_ID/i18n"
 
   mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/locpath"
diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk
index 9297b0be5b..b6a2ffd1a3 100644
--- a/packages/devel/glibc/package.mk
+++ b/packages/devel/glibc/package.mk
@@ -97,15 +97,20 @@ build-programs=yes
 EOF
 
   # binaries to install into target
-  GLIBC_INCLUDE_BIN="getent ldd locale"
-
-  # Generic "installer" needs localedef to define drawing chars
-  if [ "$PROJECT" = "Generic" ]; then
-    GLIBC_INCLUDE_BIN+=" localedef"
-  fi
+  GLIBC_INCLUDE_BIN="getent ldd locale localedef"
 }
 
 post_makeinstall_target() {
+  mkdir -p $INSTALL/.noinstall
+    cp -p $INSTALL/usr/bin/localedef $INSTALL/.noinstall
+    cp -a $INSTALL/usr/share/i18n/locales $INSTALL/.noinstall
+    mv $INSTALL/usr/share/i18n/charmaps $INSTALL/.noinstall
+
+  # Generic "installer" needs localedef to define drawing chars
+  if [ "$PROJECT" != "Generic" ]; then
+    rm $INSTALL/usr/bin/localedef
+  fi
+
 # we are linking against ld.so, so symlink
   ln -sf $(basename $INSTALL/usr/lib/ld-*.so) $INSTALL/usr/lib/ld.so
 
@@ -122,9 +127,6 @@ post_makeinstall_target() {
   safe_remove $INSTALL/usr/lib/*.map
   safe_remove $INSTALL/var
 
-# remove locales and charmaps
-  safe_remove $INSTALL/usr/share/i18n/charmaps
-
 # add UTF-8 charmap for Generic (charmap is needed for installer)
   if [ "$PROJECT" = "Generic" ]; then
     mkdir -p $INSTALL/usr/share/i18n/charmaps