diff --git a/Xorg/app/dillo/Makefile b/Xorg/app/dillo/Makefile
index 535abe5bc..ad2f51f82 100644
--- a/Xorg/app/dillo/Makefile
+++ b/Xorg/app/dillo/Makefile
@@ -20,6 +20,7 @@ PKG_SOURCE_URL:=http://hg.dillo.org/dillo
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/dillo
   SECTION:=xorg-app
@@ -27,7 +28,7 @@ define Package/dillo
   SUBMENU:=app
   TITLE:=Dillo2
   URL:=http://fltk.org/
-  DEPENDS:=+libXft +libstdcpp +libpthread +zlib +fltk2 +libjpeg +libiconv +libpng
+  DEPENDS:=+libXft +libstdcpp +libpthread +zlib +fltk2 +libjpeg +libpng $(ICONV_DEPENDS)
 endef
 
 define Package/dillo/description
@@ -39,8 +40,8 @@ define Package/dillo/description
   Note: This is the fltk2 based dillo.
 endef
 
-EXTRA_CPPFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include
-EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+EXTRA_CPPFLAGS+=-I$(ICONV_PREFIX)/include
+EXTRA_LDFLAGS+=-L$(ICONV_PREFIX)/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); ./autogen.sh );
diff --git a/Xorg/app/eterm/Makefile b/Xorg/app/eterm/Makefile
index 4ab0ca559..b1f0b2697 100644
--- a/Xorg/app/eterm/Makefile
+++ b/Xorg/app/eterm/Makefile
@@ -20,6 +20,7 @@ PKG_MD5SUM:=b8869ee9c9b9516231af9eefa595cee3
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/eterm/Default
   SECTION:=xorg-extra
@@ -31,7 +32,7 @@ endef
 define Package/eterm
 $(call Package/eterm/Default)
   TITLE:=eterm
-  DEPENDS:=+libX11 +libXcursor +imlib2 +libast +libiconv
+  DEPENDS:=+libX11 +libXcursor +imlib2 +libast $(ICONV_DEPENDS)
 endef
 
 define Package/esetroot
@@ -48,8 +49,8 @@ CONFIGURE_VARS += \
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)\
-		CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libiconv/include/" \
-		LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libiconv/lib/"
+		CPPFLAGS="$(TARGET_CPPFLAGS) -I$(ICONV_PREFIX)/include/" \
+		LDFLAGS="$(TARGET_LDFLAGS) -L$(ICONV_PREFIX)/lib/"
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
diff --git a/Xorg/app/gtkperf/Makefile b/Xorg/app/gtkperf/Makefile
index a175d2a3e..9a5ad5695 100644
--- a/Xorg/app/gtkperf/Makefile
+++ b/Xorg/app/gtkperf/Makefile
@@ -20,6 +20,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+=\
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
@@ -33,11 +34,6 @@ define Package/gtkperf
   URL:=http://gtkperf.sourceforge.net
 endef
 
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
-TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libintl/lib/
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include/
-TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib/
-
 define Package/gtkperf/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) \
diff --git a/Xorg/app/xine-ui/Makefile b/Xorg/app/xine-ui/Makefile
index 7aa59c2d8..db57e9919 100644
--- a/Xorg/app/xine-ui/Makefile
+++ b/Xorg/app/xine-ui/Makefile
@@ -19,6 +19,7 @@ PKG_MD5SUM:=90ea1f76747e9788a30a73e7f4a76cf6
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 EXTRA_LDLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
@@ -27,7 +28,7 @@ define Package/xine-ui
   CATEGORY:=Xorg
   SUBMENU:=app
   TITLE:=xine user interface
-  DEPENDS:=+xine-lib +libpng +curl +libiconv +libXv +libXt +libICE +libXxf86vm +libpng +libfreetype
+  DEPENDS:=+xine-lib +libpng +curl +libXv +libXt +libICE +libXxf86vm +libpng +libfreetype $(ICONV_DEPENDS)
   URL:=http://www.xine-project.org/
 endef
 
diff --git a/Xorg/lib/atk/Makefile b/Xorg/lib/atk/Makefile
index e48007ea2..c6be1fd5a 100644
--- a/Xorg/lib/atk/Makefile
+++ b/Xorg/lib/atk/Makefile
@@ -21,10 +21,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_LDFLAGS += \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/atk
   SECTION:=xorg-libraries
diff --git a/Xorg/lib/gtk2/Makefile b/Xorg/lib/gtk2/Makefile
index dab2e094d..6da640e4e 100644
--- a/Xorg/lib/gtk2/Makefile
+++ b/Xorg/lib/gtk2/Makefile
@@ -20,6 +20,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+=\
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
diff --git a/Xorg/lib/gtkmm/Makefile b/Xorg/lib/gtkmm/Makefile
index cd141ef70..6c3febb69 100644
--- a/Xorg/lib/gtkmm/Makefile
+++ b/Xorg/lib/gtkmm/Makefile
@@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=\
-	-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+=\
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib/
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/gtkmm
   SECTION:=xorg-framework
diff --git a/Xorg/lib/hippo-canvas/Makefile b/Xorg/lib/hippo-canvas/Makefile
index 4f88caef9..571d4ae72 100644
--- a/Xorg/lib/hippo-canvas/Makefile
+++ b/Xorg/lib/hippo-canvas/Makefile
@@ -17,12 +17,13 @@ PKG_MD5SUM:=9a0f64eb0258a3e8ba710eff9798a7d0
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
 
 PKG_INSTALL:=1
 
 EXTRA_CFLAGS += \
-	-I$(STAGING_DIR)/usr/lib/libintl/include \
+	-I$(INTL_PREFIX)/include \
 	-I$(STAGING_DIR)/usr/include/libcroco-0.6 \
 
 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_hippo-canvas CONFIG_PACKAGE_python-hippo-canvas)
diff --git a/Xorg/lib/librsvg/Makefile b/Xorg/lib/librsvg/Makefile
index 4c39ff3fe..be0291d90 100644
--- a/Xorg/lib/librsvg/Makefile
+++ b/Xorg/lib/librsvg/Makefile
@@ -17,12 +17,13 @@ PKG_MD5SUM:=c4ec4fdb2b1842e221ca39127e85682d
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 PKG_INSTALL=1
 
 EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-               -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-               -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+               -L$(ICONV_PREFIX)/lib/ \
+               -L$(INTL_PREFIX)/lib/
 
 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_librsvg CONFIG_PACKAGE_librsvg-pixbuf-loader)
 
diff --git a/Xorg/lib/pango/Makefile b/Xorg/lib/pango/Makefile
index 62c487041..5d49022e6 100644
--- a/Xorg/lib/pango/Makefile
+++ b/Xorg/lib/pango/Makefile
@@ -21,11 +21,10 @@ PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=0
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/pango
   SECTION:=xorg-libraries
diff --git a/Xorg/lib/pangomm/Makefile b/Xorg/lib/pangomm/Makefile
index be3841bb4..40ed5d6c6 100644
--- a/Xorg/lib/pangomm/Makefile
+++ b/Xorg/lib/pangomm/Makefile
@@ -19,15 +19,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=\
-	-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+=\
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib/
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/pangomm
   SECTION:=xorg-libraries
diff --git a/Xorg/lib/vte/Makefile b/Xorg/lib/vte/Makefile
index d3ea572ad..dac070356 100644
--- a/Xorg/lib/vte/Makefile
+++ b/Xorg/lib/vte/Makefile
@@ -19,16 +19,17 @@ PKG_FIXUP:=libtool
 PKG_BUILD_DEPENDS:=intltool/host
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 $(call include_mk, python-package.mk)
 
 PKG_INSTALL=1
 
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include
+EXTRA_CFLAGS+=-I$(INTL_PREFIX)/include
 
 EXTRA_LDFLAGS+= \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib
+	-L$(ICONV_PREFIX)/lib \
+	-L$(INTL_PREFIX)/lib
 
 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_vte CONFIG_PACKAGE_python-vte)
 
diff --git a/Xorg/lib/wnck/Makefile b/Xorg/lib/wnck/Makefile
index c1451cee4..975d0ad8d 100644
--- a/Xorg/lib/wnck/Makefile
+++ b/Xorg/lib/wnck/Makefile
@@ -20,15 +20,10 @@ PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=intltool/host
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
-TARGET_CFLAGS+= \
-	-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include/ \
-	$(FPIC)
-
+TARGET_CFLAGS+=$(FPIC)
 TARGET_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
 	-Wl,-rpath=/usr/lib
 
@@ -38,7 +33,7 @@ define Package/libwnck
   SUBMENU:=libraries
   TITLE:=Window Navigator Construction Kit
   URL:=http://ftp.gnome.org/
-  DEPENDS:=+libX11 +gtk2 +glib2 +libXext +libintl
+  DEPENDS:=+libX11 +gtk2 +glib2 +libXext $(INTL_DEPENDS)
 endef
 
 define Package/libwnck/description
diff --git a/Xorg/wm/matchbox-window-manager/Makefile b/Xorg/wm/matchbox-window-manager/Makefile
index f8a2abed9..df23f97ee 100644
--- a/Xorg/wm/matchbox-window-manager/Makefile
+++ b/Xorg/wm/matchbox-window-manager/Makefile
@@ -19,12 +19,11 @@ PKG_MD5SUM:=3e158dcf57823b55c926d95b245500fb
 PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
 TARGET_LDFLAGS+= \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib/libiconv/lib \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib/libintl/lib
-
-include $(INCLUDE_DIR)/package.mk
 
 define Package/matchbox-window-manager
   TITLE:=matchbox window manager
diff --git a/admin/syslog-ng3/Makefile b/admin/syslog-ng3/Makefile
index d46d55b89..8ff8185e6 100644
--- a/admin/syslog-ng3/Makefile
+++ b/admin/syslog-ng3/Makefile
@@ -19,6 +19,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_IPV6 \
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/syslog-ng3
   SECTION:=admin
@@ -56,10 +57,6 @@ CONFIGURE_ARGS +=  \
 TARGET_CPPFLAGS += \
 	-I$(STAGING_DIR)/usr/include/eventlog
 
-TARGET_LDFLAGS += \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib
-
 CONFIGURE_VARS += \
 	LIBDBI_CFLAGS="-I$(STAGING_DIR)/usr/include"
 
diff --git a/lang/gst-python/Makefile b/lang/gst-python/Makefile
index 9d246d902..e94addbd0 100644
--- a/lang/gst-python/Makefile
+++ b/lang/gst-python/Makefile
@@ -17,17 +17,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 $(call include_mk, python-package.mk)
 
 
-TARGET_CFLAGS += $(FPIC) \
-	-I$(STAGING_DIR)/usr/lib/libintl/include \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include \
-
-TARGET_LDFLAGS += \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib
-
+TARGET_CFLAGS += $(FPIC)
 CONFIGURE_VARS += PYTHON=$(HOST_PYTHON)
 
 define Package/gst-python
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 4ffc3e8d5..5a9f11d3f 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -19,6 +19,7 @@ PKG_FIXUP:=libtool no-autoreconf
 PKG_BUILD_PARALLEL:=1 
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/php5/Default
   SUBMENU:=PHP
@@ -182,7 +183,7 @@ endef
 
 define Package/php5-mod-iconv
   $(call Package/php5/Default)
-  DEPENDS:=php5 +libiconv
+  DEPENDS:=php5 $(ICONV_DEPENDS)
   TITLE:=iConv shared module
 endef
 define Package/php5-mod-iconv/config
@@ -350,7 +351,7 @@ endef
 
 define Package/php5-mod-xmlreader
   $(call Package/php5/Default)
-  DEPENDS:=php5 +libxml2 +libiconv
+  DEPENDS:=php5 +libxml2 $(ICONV_DEPENDS)
   TITLE:=XMLReader shared module
 endef
 define Package/php5-mod-xmlreader/config
@@ -360,7 +361,7 @@ endef
 
 define Package/php5-mod-xmlwriter
   $(call Package/php5/Default)
-  DEPENDS:=php5 +libxml2 +libiconv
+  DEPENDS:=php5 +libxml2 $(ICONV_DEPENDS)
   TITLE:=XMLWriter shared module
 endef
   define Package/php5-mod-xmlwriter/config
@@ -390,7 +391,7 @@ PKG_CONFIGURE_OPTS:= \
 	--disable-phar
 
 ifneq ($(SDK),)
-  PKG_BUILD_DEPENDS+=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libsqlite2 libpthread libsqlite3 libpcre libxml2 libiconv
+  PKG_BUILD_DEPENDS+=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libsqlite2 libpthread libsqlite3 libpcre libxml2
 # force PKG_CONFIGURE_{LIBS,OPTS} below when built in the SDK
   CONFIG_PACKAGE_php5-cli:=m
   CONFIG_PACKAGE_php5-cgi:=m
@@ -469,7 +470,7 @@ else
 endif
 
 ifneq ($(CONFIG_PACKAGE_php5-mod-iconv),)
-  PKG_CONFIGURE_OPTS+= --with-iconv=shared,"$(STAGING_DIR)/usr"
+  PKG_CONFIGURE_OPTS+= --with-iconv=shared,"$(ICONV_PREFIX)"
 else
   PKG_CONFIGURE_OPTS+= --without-iconv
 endif
diff --git a/lang/pygobject/Makefile b/lang/pygobject/Makefile
index 66bfdf34d..fe0aa10cb 100644
--- a/lang/pygobject/Makefile
+++ b/lang/pygobject/Makefile
@@ -18,11 +18,11 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 $(call include_mk, python-package.mk)
 
 EXTRA_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib/
+	-L$(ICONV_PREFIX) -L$(INTL_PREFIX)
 
 TARGET_CFLAGS += $(FPIC)
 CONFIGURE_ARGS += --enable-static
diff --git a/lang/pygtk/Makefile b/lang/pygtk/Makefile
index 1783f213a..961818224 100644
--- a/lang/pygtk/Makefile
+++ b/lang/pygtk/Makefile
@@ -17,16 +17,9 @@ PKG_MD5SUM:=a816346d750d61e3fa67a200e4292694
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 $(call include_mk, python-package.mk)
 
-TARGET_CFLAGS+= \
-	-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include/
-
-TARGET_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib
-
 define Package/python-gtk
   SUBMENU:=Python
   SECTION:=lang
diff --git a/lang/python-dbus/Makefile b/lang/python-dbus/Makefile
index 94d8fb30d..79becc91d 100644
--- a/lang/python-dbus/Makefile
+++ b/lang/python-dbus/Makefile
@@ -19,17 +19,12 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 $(call include_mk, python-package.mk)
 
 
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/lib/libintl/include \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include
-
 TARGET_LDFLAGS += \
-	-Wl,-rpath=$(STAGING_DIR)/usr/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib
+	-Wl,-rpath=$(STAGING_DIR)/usr/lib
 
 define Package/dbus-python
   SUBMENU:=Python
diff --git a/lang/python-gnome-desktop2/Makefile b/lang/python-gnome-desktop2/Makefile
index 1162c3285..cc971a5de 100644
--- a/lang/python-gnome-desktop2/Makefile
+++ b/lang/python-gnome-desktop2/Makefile
@@ -15,18 +15,17 @@ PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.22
 PKG_MD5SUM:=504877a973f6abc0788283232cd703cb
 PKG_FIXUP:=libtool
 
+# AM_PATH_GTK_2_0
+PKG_BUILD_DEPENDS:=gtk2
+
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 $(call include_mk, python-package.mk)
 
 PKG_INSTALL=1
 
-EXTRA_CFLAGS += \
-	-I$(STAGING_DIR)/usr/lib/libintl/include \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include \
-
-EXTRA_LDFLAGS += \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib
+EXTRA_CFLAGS += -I$(ICONV_PREFIX) -I$(INTL_PREFIX)
+EXTRA_LDFLAGS += -L$(ICONV_PREFIX) -L$(INTL_PREFIX)
 
 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_python-rsvg CONFIG_PACKAGE_python-wnck)
 
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index c631e2ba4..04c8a1697 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -30,6 +30,7 @@ PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/ruby/Default
   SUBMENU:=Ruby
@@ -208,7 +209,7 @@ CONFIGURE_ARGS += \
 	--enable-ipv6 \
 	--enable-wide-getaddrinfo \
 	--with-ruby-version=minor \
-	--with-iconv-dir=$(STAGING_DIR_ROOT)/../usr/lib/libiconv \
+	--with-iconv-dir=$(ICONV_PREFIX) \
 
 TARGET_LDFLAGS += -L$(PKG_BUILD_DIR)
 
diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile
index 36b04da7f..67a311247 100644
--- a/libs/apr-util/Makefile
+++ b/libs/apr-util/Makefile
@@ -18,11 +18,12 @@ PKG_MD5SUM:=29dd557f7bd891fc2bfdffcfa081db59
 PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libaprutil
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libapr +libexpat +libiconv +libpthread +libsqlite3 +libuuid
+  DEPENDS:=+libapr +libexpat +libpthread +libsqlite3 +libuuid $(ICONV_DEPENDS)
   TITLE:=Apache Portable Runtime Utility Library
   URL:=http://apr.apache.org/
 endef
@@ -35,14 +36,14 @@ CONFIGURE_ARGS += \
 	--with-expat="$(STAGING_DIR)/usr" \
 	--without-sqlite2 \
 	--with-sqlite3="$(STAGING_DIR)/usr" \
-	--with-iconv="$(STAGING_DIR)/usr/lib/libiconv" \
+	--with-iconv="$(ICONV_PREFIX)" \
 
 CONFIGURE_VARS += \
 	ac_cv_file_dbd_apr_dbd_mysql_c=no \
 	APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat -liconv -lapr-1 -luuid -lm -lcrypt" all
+	$(MAKE) -C $(PKG_BUILD_DIR) APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat $(if $(ICONV_FULL),-liconv) -lapr-1 -luuid -lm -lcrypt" all
 	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
diff --git a/libs/dbus-glib/Makefile b/libs/dbus-glib/Makefile
index 550b85582..ab63800a7 100644
--- a/libs/dbus-glib/Makefile
+++ b/libs/dbus-glib/Makefile
@@ -20,6 +20,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 
 define Package/libdbus-glib
@@ -27,7 +28,7 @@ define Package/libdbus-glib
   CATEGORY:=Libraries
   TITLE:=D-Bus Glib bindings
   URL:=http://dbus.freedesktop.org/doc/dbus-glib/
-  DEPENDS:=+libdbus +glib2 +libiconv +libintl
+  DEPENDS:=+libdbus +glib2 $(ICONV_DEPENDS) $(INTL_DEPENDS)
 endef
 
 TARGET_CFLAGS += $(FPIC)
@@ -42,10 +43,10 @@ CONFIGURE_ARGS += \
 CONFIGURE_VARS+= \
 	ac_cv_func_posix_getpwnam_r="yes" \
 	ac_cv_have_abstract_sockets="yes" \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libintl/include" \
-	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
-	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libintl/lib" \
+	CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \
+	CPPFLAGS="$$$$CPPFLAGS -I$(INTL_PREFIX)/include" \
+	LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \
+	LDFLAGS="$$$$LDFLAGS -L$(INTL_PREFIX)/lib" \
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/dbus-1.0/dbus
diff --git a/libs/gconf2/Makefile b/libs/gconf2/Makefile
index 7e8ac3381..86b764def 100644
--- a/libs/gconf2/Makefile
+++ b/libs/gconf2/Makefile
@@ -12,18 +12,13 @@ PKG_MD5SUM:=4971d96f5ba94fe4a69396267bd5afe8
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 PKG_BUILD_DEPENDS:=orbit2/host intltool/host
 
 PKG_INSTALL=1
 
-TARGET_CFLAGS+= \
-	-I$(STAGING_DIR)/usr/lib/libintl/include \
-	-I$(STAGING_DIR)/usr/libiconv/include
-
 TARGET_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/libgconf2
diff --git a/libs/gettext-full/Makefile b/libs/gettext-full/Makefile
index 77b76d27c..32df491ea 100644
--- a/libs/gettext-full/Makefile
+++ b/libs/gettext-full/Makefile
@@ -45,11 +45,11 @@ CONFIGURE_ARGS += \
 	--without-emacs
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib/gettext-full/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/gettext-full/include/
+	$(INSTALL_DIR) $(1)/usr/lib/libintl-full/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl-full/include/
 
-	$(INSTALL_DIR) $(1)/usr/lib/gettext-full/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/gettext-full/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/libintl-full/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl-full/lib/
 
 	$(INSTALL_DIR) $(1)/usr/share/aclocal
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(1)/usr/share/aclocal/
diff --git a/libs/gettext/Makefile b/libs/gettext/Makefile
index d43dc619f..12a3bfc60 100644
--- a/libs/gettext/Makefile
+++ b/libs/gettext/Makefile
@@ -30,8 +30,8 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/libintl.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib/libintl-stub/include
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/libintl.h $(1)/usr/lib/libintl-stub/include/
 
 	$(INSTALL_DIR) $(1)/usr/share/aclocal
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/m4/* $(1)/usr/share/aclocal/
diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index c92b44c65..622f8ae77 100644
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -24,11 +24,12 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/glib2
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libiconv +libintl
+  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS)
   TITLE:=glib 2.0
   URL:=http://www.gtk.org/
 endef
@@ -37,15 +38,6 @@ define Package/glib2/description
   The GLib library of C routines
 endef
 
-TARGET_CFLAGS+= \
-	$(FPIC) \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include \
-	-I$(STAGING_DIR)/usr/lib/libintl/include
-
-TARGET_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib
-
 define Build/Configure
 	$(call Build/Configure/Default, \
 		--enable-shared \
@@ -53,6 +45,7 @@ define Build/Configure
 		--enable-debug=no \
 		--disable-selinux \
         --disable-fam \
+        $(if $(ICONV_FULL),--with-libiconv=gnu) \
 		, \
 		glib_cv_stack_grows=no \
 		glib_cv_uscore=no \
diff --git a/libs/glibmm/Makefile b/libs/glibmm/Makefile
index f47553e04..e8a362351 100644
--- a/libs/glibmm/Makefile
+++ b/libs/glibmm/Makefile
@@ -19,6 +19,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/glibmm
   SECTION:=libs
@@ -32,14 +33,8 @@ define Package/glibmm/description
 c++ bindings for glib2
 endef
 
-TARGET_CFLAGS+= \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include \
-	-I$(STAGING_DIR)/usr/lib/libintl/include
-
 TARGET_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 CONFIGURE_ARGS+= --disable-fulldocs
 
diff --git a/libs/libIDL2/Makefile b/libs/libIDL2/Makefile
index fd6759458..20564877a 100644
--- a/libs/libIDL2/Makefile
+++ b/libs/libIDL2/Makefile
@@ -23,14 +23,7 @@ PKG_INSTALL=1
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/lib/libintl/include \
-	-I$(STAGING_DIR)/usr/libiconv/include
-
-TARGET_LDFLAGS += \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib/
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libIDL2
   SECTION:=libs
diff --git a/libs/libcroco/Makefile b/libs/libcroco/Makefile
index 2398546f0..bcc17d5a7 100644
--- a/libs/libcroco/Makefile
+++ b/libs/libcroco/Makefile
@@ -10,10 +10,10 @@ PKG_MD5SUM:=1429c597aa4b75fc610ab3a542c99209
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-               -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-			   -L$(STAGING_DIR)/usr/lib/libiconv/lib/
+               -L$(ICONV_PREFIX) -L$(INTL_PREFIX)
 
 define Package/libcroco
   SECTION:=libs
diff --git a/libs/libdmapsharing/Makefile b/libs/libdmapsharing/Makefile
index bed8bd17d..24aecc2ff 100644
--- a/libs/libdmapsharing/Makefile
+++ b/libs/libdmapsharing/Makefile
@@ -23,13 +23,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+= \
-	-I$(STAGING_DIR)/usr/lib/libintl/include
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/libdmapsharing
   SECTION:=libs
diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile
index 3679e013c..897c1e34c 100644
--- a/libs/libgphoto2/Makefile
+++ b/libs/libgphoto2/Makefile
@@ -20,6 +20,7 @@ PKG_LIBTOOL_PATHS:=. libgphoto2_port
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libgphoto2/Default
   SECTION:=libs
@@ -29,7 +30,7 @@ endef
 
 define Package/libgphoto2
   $(call Package/libgphoto2/Default)
-  DEPENDS:=+libusb +libexif +libjpeg +libpthread +libltdl +libiconv
+  DEPENDS:=+libusb +libexif +libjpeg +libpthread +libltdl $(ICONV_DEPENDS)
   TITLE:=The basic library of the gphoto2 program.
   MENU:=1
 endef
@@ -50,8 +51,8 @@ CONFIGURE_ARGS += \
 	--without-libintl-prefix \
 
 CONFIGURE_VARS += \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \
-	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
+	CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \
+	LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \
 	LIBEXIF_CFLAGS="$$$$CPPFLAGS" \
 	LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \
 	LIBUSB_CFLAGS="$$$$CPPFLAGS" \
diff --git a/libs/libiconv/Makefile b/libs/libiconv/Makefile
index b230e6d84..bc91c75fa 100644
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv/Makefile
@@ -35,11 +35,11 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libiconv.a $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/libiconv-stub/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libiconv.a $(1)/usr/lib/libiconv-stub/lib/
 
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/iconv.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib/libiconv-stub/include
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/iconv.h $(1)/usr/lib/libiconv-stub/include/
 
 	$(INSTALL_DIR) $(1)/usr/share/aclocal
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/m4/* $(1)/usr/share/aclocal/
diff --git a/libs/libmms/Makefile b/libs/libmms/Makefile
index 4364cf180..62a49d564 100644
--- a/libs/libmms/Makefile
+++ b/libs/libmms/Makefile
@@ -19,6 +19,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libmms
   SECTION:=libs
@@ -36,9 +37,6 @@ define Package/libmms/description
 endef
 
 TARGET_CFLAGS += $(FPIC)
-TARGET_LDFLAGS += \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib
 
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); ./autogen.sh );
diff --git a/libs/libmpd/Makefile b/libs/libmpd/Makefile
index 5fdf2150b..292d41fe7 100644
--- a/libs/libmpd/Makefile
+++ b/libs/libmpd/Makefile
@@ -20,11 +20,9 @@ PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_CFLAGS += $(FPIC)
-TARGET_LDFLAGS += \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib
 
 define Package/libmpd
   SECTION:=libs
diff --git a/libs/libsoup/Makefile b/libs/libsoup/Makefile
index 46b2cc518..f56e1d652 100644
--- a/libs/libsoup/Makefile
+++ b/libs/libsoup/Makefile
@@ -12,15 +12,10 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS+=\
-	-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include/
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+=\
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib/
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 define Package/libsoup
   SECTION:=libs
diff --git a/libs/libsynce/Makefile b/libs/libsynce/Makefile
index 94f47f099..73ff1e5f4 100644
--- a/libs/libsynce/Makefile
+++ b/libs/libsynce/Makefile
@@ -16,13 +16,14 @@ PKG_SOURCE_URL:=@SF/synce
 PKG_MD5SUM:=fd473d3deceda7912af4427dede1736f
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
-PKG_BUILD_DEPENDS:=libiconv
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 PKG_FIXUP:=libtool
 
 define Package/libsynce
+  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS)
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=SynCE library
@@ -44,10 +45,10 @@ CONFIGURE_ARGS += \
 	--enable-odccm-support=no
 
 CONFIGURE_VARS+= \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libintl/include" \
-	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
-	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libintl/lib" \
+	CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \
+	CPPFLAGS="$$$$CPPFLAGS -I$(INTL_PREFIX)/include" \
+	LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \
+	LDFLAGS="$$$$LDFLAGS -L$(INTL_PREFIX)/lib" \
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
diff --git a/libs/libvncserver/Makefile b/libs/libvncserver/Makefile
index 6cd1d1fe2..d75724808 100644
--- a/libs/libvncserver/Makefile
+++ b/libs/libvncserver/Makefile
@@ -17,13 +17,14 @@ PKG_MD5SUM:=14af5bdae461df4666c18e5f83c150c4
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 PKG_INSTALL=1
 
 define Package/libvncserver
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+zlib +libiconv
+  DEPENDS:=+zlib $(ICONV_DEPENDS)
   TITLE:=VNC Server Library
   URL:=http://libvncserver.sourceforge.net/
 endef
diff --git a/libs/libxapian/Makefile b/libs/libxapian/Makefile
index 82b3cecd2..f144a8cb5 100644
--- a/libs/libxapian/Makefile
+++ b/libs/libxapian/Makefile
@@ -19,10 +19,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib \
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libxapian
   SECTION:=libs
diff --git a/libs/orbit2/Makefile b/libs/orbit2/Makefile
index 81b598c5f..300ec70d3 100644
--- a/libs/orbit2/Makefile
+++ b/libs/orbit2/Makefile
@@ -21,20 +21,13 @@ PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 PKG_INSTALL:=1
 
 HOST_BUILD_DEPENDS:=libIDL2/host
 PKG_BUILD_DEPENDS:=orbit2/host
 
-TARGET_CFLAGS+= \
-	-I$(STAGING_DIR)/usr/lib/libintl/include \
-	-I$(STAGING_DIR)/usr/libiconv/include
-
-TARGET_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib
-
 BIGENDIAN=no
 ifeq ($(CONFIG_BIG_ENDIAN),y)
 	BIGENDIAN:=yes
diff --git a/libs/vips/Makefile b/libs/vips/Makefile
index 6304b50c2..0420e4b13 100644
--- a/libs/vips/Makefile
+++ b/libs/vips/Makefile
@@ -17,6 +17,7 @@ PKG_MD5SUM:=852913223ce5dc115bc7088e7c9d1596
 PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 PKG_INSTALL=1
 
@@ -29,18 +30,14 @@ define Package/vips
   $(call Package/vips/Default)
   SECTION:=multimedia
   CATEGORY:=Multimedia
-  DEPENDS:=+libjpeg +libintl +glib2 +libxml2 +imagemagick +libfreetype
+  DEPENDS:=+libjpeg +glib2 +libxml2 +imagemagick +libfreetype $(INTL_DEPENDS)
 endef
 
 define Package/vips/description
   An image manipulation library.
 endef
 
-TARGET_CFLAGS+= \
-	-I$(STAGING_DIR)/usr/lib/libintl/include
-
 TARGET_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 CONFIGURE_ARGS += \
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 3be5b7c1f..141c21ffe 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -21,6 +21,7 @@ PKG_REMOVE_FILES:=autogen.sh aclocal.m4
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/gstreamer/Default
   CATEGORY:=Multimedia
@@ -95,8 +96,7 @@ CONFIGURE_ARGS += \
 
 EXTRA_LDFLAGS+= \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib
+	-L$(ICONV_PREFIX)/lib -L$(INTL_PREFIX)/lib
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/gstreamer-$(GST_VERSION)
diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile
index cea893e8a..854732f29 100644
--- a/multimedia/kissdx/Makefile
+++ b/multimedia/kissdx/Makefile
@@ -18,11 +18,12 @@ PKG_MD5SUM:=ef213d2748f5a63b1c97ac7bfa942b2f
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/kissdx
   SECTION:=multimedia
   CATEGORY:=Multimedia
-  DEPENDS:=+libjpeg +libiconv +libdvdread
+  DEPENDS:=+libjpeg +libdvdread $(ICONV_DEPENDS)
   TITLE:=PC-Link clone for KiSS media players
   URL:=http://kissdx.vidartysse.net
 endef
@@ -35,8 +36,8 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS) -DLinux -DUSE_INTERNAL_SENDFILE -std=gnu99 -Wall -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DFILE_OFFSET_BITS=64 -D_GNU_SOURCE -I$(STAGING_DIR)/usr/lib/libiconv/include -I$(STAGING_DIR)/usr/include/dvdread $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib/libiconv/lib $(TARGET_LDFLAGS)" \
+		CFLAGS="$(TARGET_CFLAGS) -DLinux -DUSE_INTERNAL_SENDFILE -std=gnu99 -Wall -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DFILE_OFFSET_BITS=64 -D_GNU_SOURCE -I$(ICONV_PREFIX)/include -I$(STAGING_DIR)/usr/include/dvdread $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -L$(ICONV_PREFIX)/lib" \
+		LDFLAGS="-L$(ICONV_PREFIX)/lib $(TARGET_LDFLAGS)" \
 		STRIP=$(STRIP) \
 		CC="$(TARGET_CROSS)gcc" all
 endef
diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile
index c047d8463..2fed224b3 100644
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@ -19,14 +19,16 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/minidlna
 PKG_BUILD_PARALLEL:=0
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/minidlna
   SECTION:=multimedia
   CATEGORY:=Multimedia
   TITLE:=UPnP A/V & DLNA Media Server
   URL:=http://minidlna.sourceforge.net/
-  DEPENDS:=+libintl +libiconv +libpthread +libexif +libjpeg \
-+libsqlite3 +libffmpeg +libid3tag +libflac +libvorbis +libuuid
+  DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg \
+  	+libid3tag +libflac +libvorbis +libuuid \
+  	$(ICONV_DEPENDS) $(INTL_DEPENDS)
 endef
 
 define Package/minidlna/description
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 0fa24709c..ab1f8f148 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -18,6 +18,7 @@ PKG_MD5SUM:=530d9b48187e36f78fc21bb19e94326d
 PKG_BUILD_DEPENDS:=libgd
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/amule
   SUBMENU:=P2P
@@ -61,10 +62,13 @@ CONFIGURE_ARGS+= \
 	--with-libpng-prefix="$(STAGING_DIR)/usr" \
 	--with-wx-prefix="$(STAGING_DIR)/usr" \
 	--with-crypto-prefix="$(STAGING_DIR)/usr" \
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
+	--with-libiconv-prefix="$(ICONV_PREFIX)" \
+	--with-libintl-prefix="$(INTL_PREFIX)" \
 	--without-x \
 
+TARGET_LDFLAGS += \
+	-liconv
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		HOSTCC="$(HOSTCC)" \
diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile
index 45e915a0a..912bed69c 100644
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@@ -18,15 +18,16 @@ PKG_SOURCE_URL:=http://get.bitlbee.org/src \
 	http://ftp.snt.utwente.nl/pub/software/bitlbee/src
 PKG_MD5SUM:=a4d7daa9b64898dd41a3a6d104692d9a
 
-PKG_BUILD_DEPENDS:=libopenssl glib1 libiconv
+PKG_BUILD_DEPENDS:=libopenssl glib1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/bitlbee
   SUBMENU:=Instant Messaging
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libopenssl +glib1 +libiconv
+  DEPENDS:=+libopenssl +glib1 $(ICONV_DEPENDS)
   TITLE:=IRC gateway to IM chat networks
   URL:=http://www.bitlbee.org/
 endef
@@ -63,11 +64,11 @@ define Build/Configure
 	);
 	$(SED) 's,^CFLAGS=.*,CFLAGS=$(TARGET_CFLAGS),g'\
 		$(PKG_BUILD_DIR)/Makefile.settings
-	@echo 'CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include' >> \
+	@echo 'CFLAGS+=-I$(ICONV_PREFIX)/include' >> \
 		$(PKG_BUILD_DIR)/Makefile.settings
 	@echo 'LFLAGS+=$(TARGET_LDFLAGS)' >> \
 		$(PKG_BUILD_DIR)/Makefile.settings
-	@echo 'LFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib' >> \
+	@echo 'LFLAGS+=-L$(ICONV_PREFIX)/lib' >> \
 		$(PKG_BUILD_DIR)/Makefile.settings
 endef
 
diff --git a/net/curlftpfs/Makefile b/net/curlftpfs/Makefile
index 016ef31cb..b4932b98c 100644
--- a/net/curlftpfs/Makefile
+++ b/net/curlftpfs/Makefile
@@ -15,6 +15,7 @@ PKG_BUILD_DEPENDS:=libiconv
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/curlftpfs
   SECTION:=net
@@ -30,13 +31,13 @@ define Package/curlftpfs/description
 endef
 
 EXTRA_CFLAGS += \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include \
+	-I$(ICONV_PREFIX)/include \
 	-I$(STAGING_DIR)/usr/include/fuse \
 	-DICONV_CONST=const
 
 EXTRA_LDFLAGS += \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib
+	-L$(INTL_PREFIX)/lib \
+	-L$(ICONV_PREFIX)/lib
 
 define Package/curlftpfs/install
 	$(INSTALL_DIR) $(1)/usr/bin
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index f60a79bfa..5c70c2d8c 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -20,6 +20,7 @@ PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/ettercap
   SECTION:=net
@@ -51,7 +52,7 @@ CONFIGURE_ARGS += \
 	--with-libnet="$(STAGING_DIR)/usr/lib/libnet-1.1.x" \
 	--with-openssl="$(STAGING_DIR)/usr" \
 	--with-libpcre="$(STAGING_DIR)/usr" \
-	--with-iconv="$(STAGING_DIR)/usr" \
+	--with-iconv="$(ICONV_PREFIX)" \
 	--with-libncurses="$(STAGING_DIR)/usr" \
 	--disable-gtk \
 	--disable-debug \
diff --git a/net/gesftpserver/Makefile b/net/gesftpserver/Makefile
index c0a234215..5146bf81d 100644
--- a/net/gesftpserver/Makefile
+++ b/net/gesftpserver/Makefile
@@ -21,11 +21,12 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/gesftpserver
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libpthread +libiconv
+  DEPENDS:=+libpthread $(ICONV_DEPENDS)
   TITLE:=SFTP server
   URL:=http://www.greenend.org.uk/rjk/sftpserver/
 endef
@@ -41,12 +42,7 @@ CONFIGURE_CMD:=./prepare
 
 TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS)
 
-TARGET_CFLAGS+= \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include/
-
-TARGET_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib \
-	-lpthread
+TARGET_LDFLAGS+=-lpthread
 
 define Package/gesftpserver/install	
 	$(INSTALL_DIR) $(1)/usr/bin
diff --git a/net/gmediaserver/Makefile b/net/gmediaserver/Makefile
index 90798969d..ab51e33b9 100644
--- a/net/gmediaserver/Makefile
+++ b/net/gmediaserver/Makefile
@@ -19,11 +19,12 @@ PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/gmediaserver
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+id3lib +libiconv +libmagic +file +libupnp +libuuid +uclibcxx +zlib
+  DEPENDS:=+id3lib +libmagic +file +libupnp +libuuid +uclibcxx +zlib $(ICONV_DEPENDS)
   TITLE:=An UPnP music media server
   URL:=http://www.nongnu.org/gmediaserver/
   SUBMENU:=multimedia
@@ -39,7 +40,7 @@ endef
 CONFIGURE_ARGS += \
 	--disable-rpath \
 	--enable-threads=posix \
-	--with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv" \
+	--with-libiconv-prefix="$(ICONV_PREFIX)" \
 	--without-libintl-prefix \
 	--with-id3lib="$(STAGING_DIR)/usr" \
 	--with-libupnp="$(STAGING_DIR)/usr" \
diff --git a/net/imspector/Makefile b/net/imspector/Makefile
index 5a122e429..2e0f8693d 100644
--- a/net/imspector/Makefile
+++ b/net/imspector/Makefile
@@ -17,6 +17,7 @@ PKG_SOURCE_URL:=http://www.imspector.org/downloads
 PKG_MD5SUM:=626abf7c2b8f15d56df679ad66624575
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/imspector
   SECTION:=net
@@ -25,7 +26,7 @@ define Package/imspector
   TITLE:=IMSpector is an Instant Messenger proxy
   URL:=http://www.imspector.org
   DEPENDS:=+libopenssl +libstdcpp +libmysqlclient +libsqlite3 +libpq \
-	+libiconv +libpthread
+	+libpthread $(ICONV_DEPENDS)
 endef
 
 define Package/imspector/description
@@ -54,7 +55,7 @@ define Build/Compile
 	    PREFIX="$(STAGING_DIR)/usr" \
 	    CXX=$(TARGET_CXX) \
 	    CXXFLAGS="$(TARGET_CXXFLAGS) $(TARGET_CFLAGS) $(FPIC) $(TARGET_CPPFLAGS) \
-			-I$(STAGING_DIR)/usr/lib/libiconv/include \
+			-I$(ICONV_PREFIX)/include \
 			$(TARGET_LDFLAGS) -DHAVE_SSL" \
 	    all
 endef
diff --git a/net/irssi/Makefile b/net/irssi/Makefile
index b0572f61c..eba48276e 100644
--- a/net/irssi/Makefile
+++ b/net/irssi/Makefile
@@ -20,6 +20,7 @@ PKG_FIXUP:=libtool
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/irssi/Default
   SUBMENU:=Instant Messaging
@@ -66,15 +67,8 @@ CONFIGURE_ARGS += \
 	--without-bot \
 	--disable-proxy
 
-EXTRA_CFLAGS+= \
-	$(TARGET_CPPFLAGS) \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include \
-	-I$(STAGING_DIR)/usr/lib/libintl/include
-
-EXTRA_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-lncurses
+EXTRA_CFLAGS+=$(TARGET_CPPFLAGS) 
+EXTRA_LDFLAGS+=-lncurses
 
 ifeq ($(BUILD_VARIANT),ssl)
 	CONFIGURE_ARGS += \
diff --git a/net/nufw/Makefile b/net/nufw/Makefile
index 40cf93cee..f4985a255 100644
--- a/net/nufw/Makefile
+++ b/net/nufw/Makefile
@@ -19,11 +19,12 @@ PKG_FIXUP:=libtool
 PKG_REMOVE_FILES:=autogen.sh aclocal.m4
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/nufw/Default
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+glib2 +libgnutls +libsasl2 +libintl +libiconv +libnetfilter-queue
+  DEPENDS:=+glib2 +libgnutls +libsasl2 +libnetfilter-queue $(ICONV_DEPENDS) $(INTL_DEPENDS)
   TITLE:=nufw
   URL:=http://www.nufw.org/
 endef
@@ -79,11 +80,11 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \
-			-I$(STAGING_DIR)/usr/lib/libintl/include \
-			-I$(STAGING_DIR)/usr/lib/libiconv/include" \
+			-I$(INTL_PREFIX)/include \
+			-I$(ICONV_PREFIX)/include" \
 		LDFLAGS="$(TARGET_LDFLAGS) \
-			-L$(STAGING_DIR)/usr/lib/libintl/lib \
-			-L$(STAGING_DIR)/usr/lib/libiconv/lib \
+			-L$(INTL_PREFIX)/lib \
+			-L$(ICONV_PREFIX)/lib \
 			-Wl,-rpath-link,$(STAGING_DIR)/usr/lib -liconv \
 			-lgnutls -lnetfilter_queue -lpthread" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
diff --git a/net/sshfs/Makefile b/net/sshfs/Makefile
index bbd6d8f93..20ebfd77f 100644
--- a/net/sshfs/Makefile
+++ b/net/sshfs/Makefile
@@ -18,6 +18,7 @@ PKG_MD5SUM:=26e9206eb5169e87e6f95f54bc005a4f
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-fuse-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/sshfs
   TITLE:=SSHFS
diff --git a/net/synce-dccm/Makefile b/net/synce-dccm/Makefile
index d0c828d74..c3059f15a 100644
--- a/net/synce-dccm/Makefile
+++ b/net/synce-dccm/Makefile
@@ -18,11 +18,12 @@ PKG_MD5SUM:=8818b71133049fe9c739166225aebe0c
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/synce-dccm
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libsynce +libiconv
+  DEPENDS:=+libsynce $(ICONV_DEPENDS)
   TITLE:=dccm for mobiles
   URL:=http://sourceforge.net/projects/synce/
 endef
@@ -32,14 +33,14 @@ Description TBD
 endef
 
 CONFIGURE_VARS+= \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libintl/include" \
-	CPPFLAGS="$$$$CPPFLAGS -Wl,-rpath-link,$(STAGING_DIR)/usr/lib:$(STAGING_DIR)/usr/lib/libiconv/lib:$(STAGING_DIR)/usr/lib/libintl/lib" 
+	CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \
+	CPPFLAGS="$$$$CPPFLAGS -I$(INTL_PREFIX)/include" \
+	CPPFLAGS="$$$$CPPFLAGS -Wl,-rpath-link,$(STAGING_DIR)/usr/lib:$(ICONV_PREFIX)/lib:$(INTL_PREFIX)/lib" 
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 	        DESTDIR="$(PKG_INSTALL_DIR)" \
-		LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
+		LDFLAGS="$(TARGET_LDFLAGS) -L$(ICONV_PREFIX)/lib" \
 		LIBS="-lsynce -liconv" \
 		all install
 endef
diff --git a/net/usbip/Makefile b/net/usbip/Makefile
index 482a4972b..925185767 100644
--- a/net/usbip/Makefile
+++ b/net/usbip/Makefile
@@ -20,6 +20,7 @@ PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/usbip/Common
   TITLE:=USB-over-IP
@@ -93,11 +94,6 @@ LIBTOOL_PATHS:=./src
 
 CFLAGS+="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include"
 
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/
-TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libintl/lib/
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libiconv/include/
-TARGET_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib/
-
 define Build/Prepare
 $(call Build/Prepare/Default)
 	(cd $(PKG_BUILD_DIR)/src; autoreconf -v --install || exit 1 )
diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index 2bfe176b2..480b28c6d 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -19,6 +19,7 @@ PKG_FIXUP = libtool
 PKG_CONFIG_DEPENDS = CONFIG_PACKAGE_weechat-mod-lua
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/weechat/Default
   SUBMENU:=Instant Messaging
@@ -36,7 +37,7 @@ endef
 define Package/weechat
 $(call Package/weechat/Default)
  MENU=1
- DEPENDS:=+libiconv +libgnutls +libncurses
+ DEPENDS:=+libgnutls +libncurses $(ICONV_DEPENDS)
 endef
 
 define Package/weechat/description
@@ -72,7 +73,7 @@ CONFIGURE_ARGS+= \
 	--with-debug=0 \
 	--with-libgnutls-prefix=$(STAGING_DIR)/usr \
 	--without-doc-xsl-prefix \
-	--with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv" \
+	--with-libiconv-prefix="$(ICONV_PREFIX)" \
 	--without-libintl-prefix \
 	--disable-aspell \
 	--disable-perl \
@@ -82,7 +83,7 @@ CONFIGURE_ARGS+= \
 	ac_cv_path_LIBGNUTLS_CONFIG="pkg-config gnutls" \
 
 TARGET_LDFLAGS += \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib \
+	-L$(ICONV_PREFIX)/lib \
 	-Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 
 ifneq ($(CONFIG_PACKAGE_weechat-mod-lua),)
diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index 6c7dbbcaf..b86f867f3 100644
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -19,6 +19,7 @@ PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/mpd
   SECTION:=sound
@@ -84,15 +85,8 @@ CONFIGURE_VARS += \
 	$(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \
 	$(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \
 
-TARGET_CFLAGS += \
-	-std=gnu99 \
-	-I$(STAGING_DIR)/usr/lib/libintl/include/ \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include/ \
-
-TARGET_LDFLAGS += \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib/ \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
+TARGET_CFLAGS += -std=gnu99
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 # use gcc instead of g++ to avoid unnecessary linking against libstdc++
 TARGET_CXX:=$(TARGET_CC)
diff --git a/sound/mpdas/Makefile b/sound/mpdas/Makefile
index 8100e7763..6b7676393 100644
--- a/sound/mpdas/Makefile
+++ b/sound/mpdas/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE_URL:=http://50hz.ws/mpdas
 PKG_MD5SUM:=8a694691dcb5d217c46754e40152186a
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/mpdas
   SECTION:=sound
@@ -33,12 +34,12 @@ define Package/mpdas/description
 endef
 
 EXTRA_CPPFLAGS:=\
-	-I$(STAGING_DIR)/usr/lib/libintl/include \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include \
+	-I$(ICONV_PREFIX)/include \
+	-I$(INTL_PREFIX)/include \
 
 EXTRA_LDFLAGS:=\
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-	-L$(STAGING_DIR)/usr/lib/libiconv/lib \
+	-L$(ICONV_PREFIX)/lib \
+	-L$(INTL_PREFIX)/lib \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 MAKE_FLAGS += \
diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile
index 48b6087a6..26ac547d1 100644
--- a/sound/pulseaudio/Makefile
+++ b/sound/pulseaudio/Makefile
@@ -22,12 +22,13 @@ PKG_FIXUP = libtool
 PKG_INSTALL = 1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 #TODO: split pulse into executable and library (or even better into several libraries since they're used as loadable modules, so not linked into)
 define Package/pulseaudio
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libspeexdsp +libgdbm +liboil +libsndfile +libatomicops +libltdl +dbus +libpthread +librt +libintl +libiconv +alsa-lib @BROKEN
+  DEPENDS:=+libspeexdsp +libgdbm +liboil +libsndfile +libatomicops +libltdl +dbus +libpthread +librt +alsa-lib $(ICONV_DEPENDS) $(INTL_DEPENDS) @BROKEN
   TITLE:=Network sound server
   URL:=http://www.pulseaudio.org
 endef
@@ -66,7 +67,7 @@ CONFIGURE_ARGS += \
 CONFIGURE_VARS += \
 	PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
 
-#SUPP_LIBS:=-L$(STAGING_DIR)/usr/lib/libintl/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib
+#SUPP_LIBS:=-L$(INTL_PREFIX)/lib -L$(ICONV_PREFIX)/lib
 TARGET_CFLAGS += -std=gnu99
 
 define Package/pulseaudio/install
diff --git a/utils/bemused/Makefile b/utils/bemused/Makefile
index 5a0f2e0d5..a306f8ec2 100644
--- a/utils/bemused/Makefile
+++ b/utils/bemused/Makefile
@@ -16,11 +16,12 @@ PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/526
 PKG_MD5SUM:=aed8b41aed530e9177e43d9bebad10b7
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/bemusedlinuxserver
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp +libiconv
+  DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp $(ICONV_DEPENDS)
   TITLE:=Bemused linux server
   URL:=http://bemused-lnx-mpdhack.origo.ethz.ch/
 endef
@@ -38,8 +39,8 @@ define Build/Compile
 	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS) " \
 	CPPFLAGS="$(TARGET_CPPFLAGS)" \
-	INCL="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include -I$(STAGING_DIR)/usr/lib/libiconv/include" \
-	MYLIBS="-lbluetooth -lglib -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv"
+	INCL="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include -I$(ICONV_PREFIX)/include" \
+	MYLIBS="-lbluetooth -lglib -L$(ICONV_PREFIX)/lib -liconv"
 	$(STRIP) $(PKG_BUILD_DIR)/bemusedlinuxserver
 endef
 
diff --git a/utils/bluez-utils/Makefile b/utils/bluez-utils/Makefile
index 17d4f41a1..876d7808d 100644
--- a/utils/bluez-utils/Makefile
+++ b/utils/bluez-utils/Makefile
@@ -18,11 +18,12 @@ PKG_MD5SUM:=4fc292b635ba7b442c7aaf5680199012
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/bluez-utils
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+bluez-libs +libpthread +dbus +libintl +libiconv
+  DEPENDS:=+bluez-libs +libpthread +dbus $(INTL_DEPENDS) $(ICONV_DEPENDS)
   TITLE:=Bluetooth utilities
   URL:=http://www.bluez.org/
 endef
@@ -49,8 +50,8 @@ CONFIGURE_ARGS += \
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		LDFLAGS="$(TARGET_LDFLAGS) \
-			-L$(STAGING_DIR)/usr/lib/libintl/lib \
-			-L$(STAGING_DIR)/usr/lib/libiconv/lib" \
+			-L$(ICONV_PREFIX)/lib \
+			-L$(INTL_PREFIX)/lib" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
diff --git a/utils/gnuplot/Makefile b/utils/gnuplot/Makefile
index 2cf8d3e01..b9ea10625 100644
--- a/utils/gnuplot/Makefile
+++ b/utils/gnuplot/Makefile
@@ -11,15 +11,10 @@ PKG_SOURCE_URL:=@SF/gnuplot
 PKG_MD5SUM:=e708665bd512153ad5c35252fe499059
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/lib/libintl/include \
-	-I$(STAGING_DIR)/usr/lib/libiconv/include
+include $(INCLUDE_DIR)/nls.mk
 
 TARGET_LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib \
-       	-L$(STAGING_DIR)/usr/lib/libiconv/lib
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
 CONFIGURE_VARS += \
 	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
@@ -29,7 +24,7 @@ CONFIGURE_VARS += \
 define Package/gnuplot
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libncurses +uclibcxx +zlib +libpng +libfreetype +libgd +libintl +libiconv
+  DEPENDS:=+libncurses +uclibcxx +zlib +libpng +libfreetype +libgd $(INTL_DEPENDS) $(ICONV_DEPENDS)
   TITLE:=A portable command-line driven graphing utility
   URL:=http://sourceforge.net/projects/gnuplot/
 endef
diff --git a/utils/lcd4linux/Makefile b/utils/lcd4linux/Makefile
index 55e112de4..d312d42ea 100644
--- a/utils/lcd4linux/Makefile
+++ b/utils/lcd4linux/Makefile
@@ -24,7 +24,6 @@ PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:= \
 	libdbus \
 	libgd \
-	libiconv \
 	libmysqlclient \
 	libncurses \
 	libnmeap \
@@ -39,6 +38,7 @@ PKG_BUILD_DEPENDS:= \
 #	python \
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/lcd4linux
   SECTION:=utils
@@ -46,7 +46,7 @@ define Package/lcd4linux
   DEPENDS:= \
 	+LCD4LINUX_NEEDS_libdbus:libdbus \
 	+LCD4LINUX_NEEDS_libgd:libgd \
-	+LCD4LINUX_NEEDS_libiconv:libiconv \
+	$(if $(ICONV_FULL),+LCD4LINUX_NEEDS_libiconv:libiconv-full) \
 	+LCD4LINUX_NEEDS_libmysqlclient:libmysqlclient \
 	+LCD4LINUX_NEEDS_libncurses:libncurses \
 	+LCD4LINUX_NEEDS_libnmeap:libnmeap \
@@ -195,7 +195,7 @@ EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 
 ifneq ($(CONFIG_LCD4LINUX_NEEDS_libiconv),)
   CONFIGURE_ARGS+= \
-	--with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv"
+	--with-libiconv-prefix="$(ICONV_PREFIX)"
 else
   CONFIGURE_ARGS+= \
 	--without-libiconv-prefix