diff --git a/packages/converters/libiconv/install b/packages/converters/libiconv/install
index 503e166f90..df5209de77 100755
--- a/packages/converters/libiconv/install
+++ b/packages/converters/libiconv/install
@@ -2,5 +2,7 @@
 
 . config/options
 
+$SCRIPTS/install gettext
+
 mkdir -p $INSTALL/usr/lib
 cp -PR $BUILD/$1*/lib/.libs/*.so* $INSTALL/usr/lib
diff --git a/packages/devel/dbus-glib/install b/packages/devel/dbus-glib/install
index 391ce6d199..3693997178 100755
--- a/packages/devel/dbus-glib/install
+++ b/packages/devel/dbus-glib/install
@@ -5,6 +5,7 @@
 $SCRIPTS/install dbus
 $SCRIPTS/install glib
 $SCRIPTS/install expat
+$SCRIPTS/install gettext
 
 mkdir -p $INSTALL/usr/lib
 cp -PR $BUILD/$1*/dbus/.libs/*.so* $INSTALL/usr/lib
diff --git a/packages/devel/gettext/build b/packages/devel/gettext/build
index 0ced861f20..86bc3911e7 100755
--- a/packages/devel/gettext/build
+++ b/packages/devel/gettext/build
@@ -11,9 +11,11 @@ cd $BUILD/$1*/
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --enable-static \
-            --disable-shared \
+            --disable-static \
+            --enable-shared \
 
 make
 
+$STRIP .libs/libintl*.so*
+
 $MAKEINSTALL
diff --git a/packages/network/avahi/build b/packages/network/avahi/build
index 5ded03b0a7..b0cedf74ee 100755
--- a/packages/network/avahi/build
+++ b/packages/network/avahi/build
@@ -4,6 +4,7 @@
 
 $SCRIPTS/build toolchain
 $SCRIPTS/build expat
+$SCRIPTS/build gettext
 $SCRIPTS/build libdaemon
 $SCRIPTS/build dbus
 $SCRIPTS/build Python
@@ -14,14 +15,14 @@ $SCRIPTS/build pygtk
 
 cd $BUILD/$1*
 
+#ac_cv_func_bind_textdomain_codeset=no \
+#ac_func_bind_textdomain_codeset=no \
+#ac_cv_lib_intl_bindtextdomain=no \
+#ac_cv_lib_intl_dcgettext=no \
+#ac_cv_lib_intl_ngettext=no \
+#gt_cv_func_ngettext_libc=no \
 py_cv_mod_gtk_=yes \
 py_cv_mod_dbus_=yes \
-ac_cv_func_bind_textdomain_codeset=no \
-ac_func_bind_textdomain_codeset=no \
-ac_cv_lib_intl_bindtextdomain=no \
-ac_cv_lib_intl_dcgettext=no \
-ac_cv_lib_intl_ngettext=no \
-gt_cv_func_ngettext_libc=no \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -66,7 +67,6 @@ gt_cv_func_ngettext_libc=no \
             --with-avahi-group=root \
             --with-autoipd-user=root \
             --with-autoipd-group=root \
-            --disable-nls
 
 make
 
diff --git a/packages/network/avahi/install b/packages/network/avahi/install
index 70280990e8..b4ac32b236 100755
--- a/packages/network/avahi/install
+++ b/packages/network/avahi/install
@@ -4,6 +4,7 @@
 
 $SCRIPTS/install expat
 $SCRIPTS/install libdaemon
+$SCRIPTS/install gettext
 $SCRIPTS/install dbus
 $SCRIPTS/install Python
 $SCRIPTS/install dbus-python
diff --git a/packages/network/bluez/build b/packages/network/bluez/build
index d501ea55a4..d56cd88c95 100755
--- a/packages/network/bluez/build
+++ b/packages/network/bluez/build
@@ -5,6 +5,7 @@
 $SCRIPTS/build toolchain
 $SCRIPTS/build dbus
 $SCRIPTS/build glib
+$SCRIPTS/build gettext
 
 cd $BUILD/$1*
 
diff --git a/packages/network/bluez/install b/packages/network/bluez/install
index f7864fed0f..c3c1e91bd1 100755
--- a/packages/network/bluez/install
+++ b/packages/network/bluez/install
@@ -4,6 +4,7 @@
 
 $SCRIPTS/install dbus
 $SCRIPTS/install glib
+$SCRIPTS/install gettext
 $SCRIPTS/install setserial
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
diff --git a/packages/network/connman/build b/packages/network/connman/build
index 7166f0c10d..bb1e8142e2 100755
--- a/packages/network/connman/build
+++ b/packages/network/connman/build
@@ -8,6 +8,7 @@ $SCRIPTS/build dbus
 $SCRIPTS/build udev
 $SCRIPTS/build busybox
 $SCRIPTS/build bluez
+$SCRIPTS/build gettext
 
 cd $BUILD/$1*
 #./bootstrap
diff --git a/packages/network/connman/install b/packages/network/connman/install
index 8e1dcbcad0..df57ee36a5 100755
--- a/packages/network/connman/install
+++ b/packages/network/connman/install
@@ -7,6 +7,7 @@ $SCRIPTS/install dbus
 $SCRIPTS/install udev
 $SCRIPTS/install bluez
 $SCRIPTS/install wpa_supplicant
+$SCRIPTS/install gettext
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
diff --git a/packages/sysutils/hal/install b/packages/sysutils/hal/install
index 29ab22cba2..3820448609 100755
--- a/packages/sysutils/hal/install
+++ b/packages/sysutils/hal/install
@@ -7,6 +7,7 @@ $SCRIPTS/install glib
 $SCRIPTS/install udev
 $SCRIPTS/install dbus
 $SCRIPTS/install dbus-glib
+$SCRIPTS/install gettext
 
 mkdir -p $INSTALL/usr/sbin
 cp $BUILD/$1*/hald/hald $INSTALL/usr/sbin/
diff --git a/packages/x11-toolkits/gtk+/build b/packages/x11-toolkits/gtk+/build
index a52f5c9626..137dd819a0 100755
--- a/packages/x11-toolkits/gtk+/build
+++ b/packages/x11-toolkits/gtk+/build
@@ -98,7 +98,8 @@ gt_cv_func_ngettext_libc=no \
             --without-libjasper \
             --enable-shm \
             --disable-gdiplus \
-            --disable-cups
+            --disable-cups \
+            --disable-nls
 
 make SRC_SUBDIRS="gdk-pixbuf gdk gtk modules perf contrib"