diff --git a/make/ni.mk b/make/ni.mk
index 67b22f39..a245fb38 100644
--- a/make/ni.mk
+++ b/make/ni.mk
@@ -63,13 +63,13 @@ ni-image:
 	make -j$(NUM_CPUS) mtd-utils
 	make -j$(NUM_CPUS) wget
 	make -j$(NUM_CPUS) iconv
+	make -j$(NUM_CPUS) streamripper
 ifeq ($(BOXSERIES), hd2)
 	make plugins-hd2
 	make -j$(NUM_CPUS) less
 	make -j$(NUM_CPUS) parted
 	make -j$(NUM_CPUS) openvpn
 	make -j$(NUM_CPUS) openssh
-	make -j$(NUM_CPUS) streamripper
   ifneq ($(BOXMODEL), kronos_v2)
 	make -j$(NUM_CPUS) bash
 	make -j$(NUM_CPUS) iperf
diff --git a/make/system-libs.mk b/make/system-libs.mk
index 3c4be3a6..e80b86ed 100644
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@@ -1003,8 +1003,16 @@ $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz
 	$(REMOVE)/libffi-$(LIBFFI_VER)
 	touch $@
 
+# glibc provides a stub
+# gettext implementation,
+# so we only build it for hd2
+LIBGLIB_DEPS = $(D)/gettext
+ifeq ($(BOXSERIES), hd1)
+	LIBGLIB_DEPS =
+endif
+
 # why does a shared build fail?
-$(D)/libglib: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(D)/gettext $(D)/libffi | $(TARGETPREFIX)
+$(D)/libglib: $(ARCHIVE)/glib-$(GLIB_VER).tar.xz $(D)/zlib $(LIBGLIB_DEPS) $(D)/libffi | $(TARGETPREFIX)
 	$(UNTAR)/glib-$(GLIB_VER).tar.xz
 	pushd $(BUILD_TMP)/glib-$(GLIB_VER); \
 		echo "ac_cv_type_long_long=yes"		 > arm-linux.cache; \