diff --git a/make/image-updates.mk b/make/image-updates.mk
index e1ca46b7..262c6c38 100644
--- a/make/image-updates.mk
+++ b/make/image-updates.mk
@@ -53,7 +53,7 @@ u-neutrino-full: neutrino-clean
 	$(MAKE) u-init
 	echo "killall start_neutrino neutrino; sleep 5"	>> $(PREINSTALL_SH)
 	echo "sync; reboot"				>> $(POSTINSTALL_SH)
-	$(MAKE) neutrino N_INST_DIR=$(UPDATE_INST_DIR)
+	$(MAKE) neutrino NEUTRINO_INST_DIR=$(UPDATE_INST_DIR)
 	$(INSTALL_EXEC) -D $(TARGET_sysconfdir)/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino
 ifneq ($(DEBUG), yes)
 	find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true
diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk
index acfed592..ba4d58e5 100644
--- a/make/neutrino-plugins.mk
+++ b/make/neutrino-plugins.mk
@@ -17,89 +17,103 @@ endif
 
 # -----------------------------------------------------------------------------
 
-NP_OBJ_DIR = $(BUILD_DIR)/$(NI-NEUTRINO-PLUGINS)
-
-NP_DEPS  = ffmpeg
-NP_DEPS += libcurl
-NP_DEPS += libpng
-NP_DEPS += libjpeg-turbo
-NP_DEPS += giflib
-NP_DEPS += freetype
-NP_DEPS += luaexpat
-NP_DEPS += luajson
-NP_DEPS += luacurl
-NP_DEPS += luaposix
-NP_DEPS += lua-feedparser
+NEUTRINO-PLUGINS_BUILD_DIR = $(BUILD_DIR)/$(NI-NEUTRINO-PLUGINS)
 
 # -----------------------------------------------------------------------------
 
-NP_CONFIGURE_ADDITIONS = \
-		--disable-logoupdater \
-		--disable-logoview \
-		--disable-mountpointmanagement \
-		--disable-stbup
+NEUTRINO-PLUGINS_DEPS  = ffmpeg
+NEUTRINO-PLUGINS_DEPS += libcurl
+NEUTRINO-PLUGINS_DEPS += libpng
+NEUTRINO-PLUGINS_DEPS += libjpeg-turbo
+NEUTRINO-PLUGINS_DEPS += giflib
+NEUTRINO-PLUGINS_DEPS += freetype
+NEUTRINO-PLUGINS_DEPS += luaexpat
+NEUTRINO-PLUGINS_DEPS += luajson
+NEUTRINO-PLUGINS_DEPS += luacurl
+NEUTRINO-PLUGINS_DEPS += luaposix
+NEUTRINO-PLUGINS_DEPS += lua-feedparser
+
+# -----------------------------------------------------------------------------
+
+NEUTRINO-PLUGINS_CONF_ENV = \
+	$(MAKE_ENV)
+
+# -----------------------------------------------------------------------------
+
+NEUTRINO-PLUGINS_CONF_OPTS = \
+	--host=$(TARGET) \
+	--build=$(BUILD) \
+	--prefix=$(prefix) \
+	--sysconfdir=$(sysconfdir) \
+	--enable-maintainer-mode \
+	--enable-silent-rules \
+	\
+	--with-neutrino-source=$(SOURCE_DIR)/$(NI-NEUTRINO) \
+	--with-neutrino-build=$(NEUTRINO_BUILD_DIR) \
+	\
+	--with-target=cdk \
+	--with-targetprefix=$(prefix) \
+	--with-boxtype=$(BOXTYPE)
 
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2))
+  NEUTRINO-PLUGINS_CONF_OPTS += --with-boxmodel=$(BOXSERIES)
+else
+  NEUTRINO-PLUGINS_CONF_OPTS += --with-boxmodel=$(BOXMODEL)
+endif
+
+NEUTRINO-PLUGINS_CONF_OPTS += \
+	--disable-logoupdater \
+	--disable-logoview \
+	--disable-mountpointmanagement \
+	--disable-stbup
+
+ifeq ($(BOXTYPE), coolstream)
   ifeq ($(BOXSERIES), hd1)
-    NP_CONFIGURE_ADDITIONS += \
-		--disable-spiegel_tv_doc \
-		--disable-tierwelt_tv
+    NEUTRINO-PLUGINS_CONF_OPTS += \
+	--disable-spiegel_tv_doc \
+	--disable-tierwelt_tv
   endif
-  NP_CONFIGURE_ADDITIONS += \
-		--disable-showiframe \
-		--disable-stb_startup \
-		--disable-imgbackup \
-		--disable-rcu_switcher
+  NEUTRINO-PLUGINS_CONF_OPTS += \
+	--disable-showiframe \
+	--disable-stb_startup \
+	--disable-imgbackup \
+	--disable-rcu_switcher
 endif
 
 # -----------------------------------------------------------------------------
 
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2))
-  NP_BOXMODEL = $(BOXSERIES)
+  NEUTRINO-PLUGINS_BOXMODEL = $(BOXSERIES)
 else
-  NP_BOXMODEL = $(BOXMODEL)
+  NEUTRINO-PLUGINS_BOXMODEL = $(BOXMODEL)
 endif
 
 # -----------------------------------------------------------------------------
 
-$(NP_OBJ_DIR)/config.status: $(NP_DEPS)
-	test -d $(NP_OBJ_DIR) || mkdir -p $(NP_OBJ_DIR)
+$(NEUTRINO-PLUGINS_BUILD_DIR)/config.status: $(NEUTRINO-PLUGINS_DEPS)
+	test -d $(NEUTRINO-PLUGINS_BUILD_DIR) || mkdir -p $(NEUTRINO-PLUGINS_BUILD_DIR)
 	$(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/autogen.sh
-	$(CD) $(NP_OBJ_DIR); \
-		$(MAKE_ENV) \
+	$(CD) $(NEUTRINO-PLUGINS_BUILD_DIR); \
+		$(NEUTRINO_PLUGINS_CONF_ENV) \
 		$(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/configure \
-			--host=$(TARGET) \
-			--build=$(BUILD) \
-			--prefix=$(prefix) \
-			--sysconfdir=$(sysconfdir) \
-			--enable-maintainer-mode \
-			--enable-silent-rules \
-			\
-			--with-neutrino-source=$(SOURCE_DIR)/$(NI-NEUTRINO) \
-			--with-neutrino-build=$(N_OBJ_DIR) \
-			\
-			$(NP_CONFIGURE_ADDITIONS) \
-			\
-			--with-target=cdk \
-			--with-targetprefix=$(prefix) \
-			--with-boxtype=$(BOXTYPE) \
-			--with-boxmodel=$(NP_BOXMODEL)
+			$(NEUTRINO-PLUGINS_CONF_OPTS)
 
 # -----------------------------------------------------------------------------
 
-NP_INIT-SCRIPTS-DEFAULTS  = emmrd
-NP_INIT-SCRIPTS-DEFAULTS += fritzcallmonitor
-NP_INIT-SCRIPTS-DEFAULTS += ovpn
-NP_INIT-SCRIPTS-DEFAULTS += rcu_switcher
-#NP_INIT-SCRIPTS-DEFAULTS += stbup
-NP_INIT-SCRIPTS-DEFAULTS += tuxcald
-NP_INIT-SCRIPTS-DEFAULTS += tuxmaild
+NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS  =
+NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += emmrd
+NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += fritzcallmonitor
+NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += ovpn
+NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += rcu_switcher
+#NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += stbup
+NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += tuxcald
+NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS += tuxmaild
 
-NP_INIT-SCRIPTS  = $(NP_INIT-SCRIPTS_DEFAULTS)
-NP_INIT-SCRIPTS += turnoff_power
+NEUTRINO-PLUGINS_INIT-SCRIPTS  = $(NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS)
+NEUTRINO-PLUGINS_INIT-SCRIPTS += turnoff_power
 
-define NP_RUNLEVEL-LINKS_INSTALL
-	for script in $(NP_INIT-SCRIPTS-DEFAULTS); do \
+define NEUTRINO-PLUGINS_RUNLEVEL-LINKS_INSTALL
+	for script in $(NEUTRINO-PLUGINS_INIT-SCRIPTS_DEFAULTS); do \
 		if [ -x $(TARGET_sysconfdir)/init.d/$$script ]; then \
 			$(UPDATE-RC.D) $$script defaults 80 20; \
 		fi; \
@@ -109,8 +123,8 @@ define NP_RUNLEVEL-LINKS_INSTALL
 	fi
 endef
 
-define NP_RUNLEVEL-LINKS_UNINSTALL
-	for link in $(NP_INIT-SCRIPTS); do \
+define NEUTRINO-PLUGINS_RUNLEVEL-LINKS_UNINSTALL
+	for link in $(NEUTRINO-PLUGINS_INIT-SCRIPTS); do \
 		find $(TARGET_sysconfdir) -type l -name [SK]??$$link -print0 | \
 			xargs --no-run-if-empty -0 rm -f; \
 	done
@@ -118,37 +132,37 @@ endef
 
 # -----------------------------------------------------------------------------
 
-neutrino-plugins: neutrino $(NP_OBJ_DIR)/config.status
+neutrino-plugins: neutrino $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	$(MAKE) -C $(NP_OBJ_DIR) all     DESTDIR=$(TARGET_DIR)
-	$(MAKE) -C $(NP_OBJ_DIR) install DESTDIR=$(TARGET_DIR)
-	$(NP_RUNLEVEL-LINKS_INSTALL)
+	$(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR) all     DESTDIR=$(TARGET_DIR)
+	$(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR) install DESTDIR=$(TARGET_DIR)
+	$(NEUTRINO-PLUGINS_RUNLEVEL-LINKS_INSTALL)
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
 neutrino-plugins-uninstall:
-	-make -C $(NP_OBJ_DIR) uninstall DESTDIR=$(TARGET_DIR)
-	$(NP_RUNLEVEL-LINKS_UNINSTALL)
+	-make -C $(NEUTRINO-PLUGINS_BUILD_DIR) uninstall DESTDIR=$(TARGET_DIR)
+	$(NEUTRINO-PLUGINS_RUNLEVEL-LINKS_UNINSTALL)
 
 neutrino-plugins-distclean:
-	-make -C $(NP_OBJ_DIR) distclean
+	-make -C $(NEUTRINO-PLUGINS_BUILD_DIR) distclean
 
 neutrino-plugins-clean: neutrino-plugins-uninstall neutrino-plugins-distclean
-	rm -f $(NP_OBJ_DIR)/config.status
+	rm -f $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status
 	rm -f $(DEPS_DIR)/neutrino-plugins
 
 neutrino-plugins-clean-all: neutrino-plugins-clean
-	rm -rf $(NP_OBJ_DIR)
+	rm -rf $(NEUTRINO-PLUGINS_BUILD_DIR)
 
 # -----------------------------------------------------------------------------
 
 # To build single plugins from neutrino-plugins repository call
 # make neutrino-plugin-<subdir>; e.g. make neutrino-plugin-tuxwetter
 
-neutrino-plugin-%: $(NP_OBJ_DIR)/config.status
+neutrino-plugin-%: $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	$(MAKE) -C $(NP_OBJ_DIR)/$(subst neutrino-plugin-,,$(@)) all install DESTDIR=$(TARGET_DIR)
+	$(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@)) all install DESTDIR=$(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/neutrino.mk b/make/neutrino.mk
index 7a76c086..4b749253 100644
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -3,185 +3,172 @@
 #
 # -----------------------------------------------------------------------------
 
-N_INST_DIR ?= $(TARGET_DIR)
-N_OBJ_DIR = $(BUILD_DIR)/$(NI-NEUTRINO)
+NEUTRINO_INST_DIR ?= $(TARGET_DIR)
 
-# -----------------------------------------------------------------------------
-
-N_DEPS  =
-N_DEPS += ffmpeg
-N_DEPS += freetype
-N_DEPS += giflib
-N_DEPS += libcurl
-N_DEPS += libdvbsi
-N_DEPS += fribidi
-N_DEPS += libjpeg-turbo
-N_DEPS += libsigc
-N_DEPS += lua
-N_DEPS += ntp
-N_DEPS += openssl
-N_DEPS += openthreads
-N_DEPS += pugixml
-N_DEPS += zlib
-
-ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuduo4kse vuultimo4k vuuno4kse))
-  N_DEPS += graphlcd-base
-endif
+NEUTRINO_BUILD_DIR = $(BUILD_DIR)/$(NI-NEUTRINO)
+LIBSTB-HAL_BUILD_DIR = $(BUILD_DIR)/$(NI-LIBSTB-HAL)
 
-ifeq ($(BOXTYPE), coolstream)
-  N_DEPS += coolstream-drivers
-  ifeq ($(HAS_LIBCS), yes)
-    N_DEPS += libcoolstream
-  endif
-else
-  N_DEPS += libstb-hal
-endif
+# -----------------------------------------------------------------------------
 
-# uncomment next lines to build neutrino without --enable-ffmpegdec
-#N_DEPS += libFLAC
-#N_DEPS += libid3tag
-#N_DEPS += libmad
-#N_DEPS += libvorbisidec
+NEUTRINO_DEPS  =
+NEUTRINO_DEPS += ffmpeg
+NEUTRINO_DEPS += freetype
+NEUTRINO_DEPS += giflib
+NEUTRINO_DEPS += libcurl
+NEUTRINO_DEPS += libdvbsi
+NEUTRINO_DEPS += fribidi
+NEUTRINO_DEPS += libjpeg-turbo
+NEUTRINO_DEPS += libsigc
+NEUTRINO_DEPS += lua
+NEUTRINO_DEPS += ntp
+NEUTRINO_DEPS += openssl
+NEUTRINO_DEPS += openthreads
+NEUTRINO_DEPS += pugixml
+NEUTRINO_DEPS += zlib
 
 # -----------------------------------------------------------------------------
 
-N_CFLAGS = -Wall -W -Wshadow -D__STDC_CONSTANT_MACROS
+NEUTRINO_CFLAGS = -Wall -W -Wshadow -D__STDC_CONSTANT_MACROS
 ifeq ($(BOXSERIES), hd1)
-  N_CFLAGS += -DCPU_FREQ
+  NEUTRINO_CFLAGS += -DCPU_FREQ
 endif
 ifeq ($(BOXSERIES), hd2)
-  N_CFLAGS += -DFB_HW_ACCELERATION
+  NEUTRINO_CFLAGS += -DFB_HW_ACCELERATION
 endif
 
 ifeq ($(DEBUG), yes)
-  N_CFLAGS += -ggdb3 -rdynamic -I$(TARGET_includedir)
+  NEUTRINO_CFLAGS += -ggdb3 -rdynamic -I$(TARGET_includedir)
 else
-  N_CFLAGS += $(TARGET_CFLAGS)
+  NEUTRINO_CFLAGS += $(TARGET_CFLAGS)
 endif
 
-N_CFLAGS += -Wno-psabi
+NEUTRINO_CFLAGS += -Wno-psabi
 
 # -----------------------------------------------------------------------------
 
-N_LDFLAGS = -lcrypto -ldl -lz $(CORTEX-STRINGS_LDFLAG) -L$(TARGET_libdir)
+NEUTRINO_LDFLAGS = -lcrypto -ldl -lz $(CORTEX-STRINGS_LDFLAG) -L$(TARGET_libdir)
 ifeq ($(DEBUG), yes)
-  N_LDFLAGS += -Wl,-rpath-link,$(TARGET_libdir)
+  NEUTRINO_LDFLAGS += -Wl,-rpath-link,$(TARGET_libdir)
 else
-  N_LDFLAGS += -Wl,-O1 -Wl,-rpath-link,$(TARGET_libdir) $(TARGET_EXTRA_LDFLAGS)
+  NEUTRINO_LDFLAGS += -Wl,-O1 -Wl,-rpath-link,$(TARGET_libdir) $(TARGET_EXTRA_LDFLAGS)
 endif
 
 # -----------------------------------------------------------------------------
 
-N_CONFIGURE_DEBUG =
-ifeq ($(BOXTYPE)-$(HAS_LIBCS), coolstream-yes)
-  ifeq ($(DEBUG), yes)
-    N_CONFIGURE_DEBUG += \
-		--enable-libcoolstream-static \
-		--with-libcoolstream-static-dir=$(TARGET_libdir)
-  endif
-endif
+NEUTRINO_OMDB_API_KEY ?= 20711f9e
+NEUTRINO_SHOUTCAST_DEV_KEY ?= fa1669MuiRPorUBw
+NEUTRINO_TMDB_DEV_KEY ?= 7270f1b571c4ecbb5b204ddb7f8939b1
+NEUTRINO_YOUTUBE_DEV_KEY ?= AIzaSyBLdZe7M3rpNMZqSj-3IEvjbb2hATWJIdM
+NEUTRINO_WEATHER_DEV_KEY ?=
 
 # -----------------------------------------------------------------------------
 
-N_CONFIGURE_LIBSTB-HAL =
-ifneq ($(BOXTYPE), coolstream)
-  N_CONFIGURE_LIBSTB-HAL += \
-		--with-stb-hal-includes=$(SOURCE_DIR)/$(NI-LIBSTB-HAL)/include \
-		--with-stb-hal-build=$(LH_OBJ_DIR)
-endif
+NEUTRINO_CONF_ENV = \
+	$(MAKE_OPTS) \
+	\
+	CFLAGS="$(NEUTRINO_CFLAGS)" \
+	CPPFLAGS="$(NEUTRINO_CFLAGS)" \
+	CXXFLAGS="$(NEUTRINO_CFLAGS) -std=c++11" \
+	LDFLAGS="$(NEUTRINO_LDFLAGS)"
+
+NEUTRINO_CONF_ENV += \
+	PKG_CONFIG=$(PKG_CONFIG) \
+	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
 
 # -----------------------------------------------------------------------------
 
-N_CONFIGURE_ADDITIONS =
-ifeq ($(BOXTYPE), coolstream)
-  N_CONFIGURE_ADDITIONS += \
-		--enable-pip
-endif
-ifeq ($(BOXTYPE), armbox)
-  N_CONFIGURE_ADDITIONS += \
-		--disable-arm-acc
-endif
-ifeq ($(BOXTYPE), mipsbox)
-  N_CONFIGURE_ADDITIONS += \
-		--disable-mips-acc
+NEUTRINO_CONF_OPTS = \
+	--host=$(TARGET) \
+	--build=$(BUILD) \
+	--prefix=$(prefix) \
+	--enable-maintainer-mode \
+	--enable-silent-rules \
+	\
+	--enable-freesatepg \
+	--enable-fribidi \
+	--enable-giflib \
+	--enable-lua \
+	--enable-mdev \
+	--enable-pugixml \
+	\
+	--with-omdb-api-key="$(NEUTRINO_OMDB_API_KEY)" \
+	--with-shoutcast-dev-key="$(NEUTRINO_SHOUTCAST_DEV_KEY)" \
+	--with-tmdb-dev-key="$(NEUTRINO_TMDB_DEV_KEY)" \
+	--with-youtube-dev-key="$(NEUTRINO_YOUTUBE_DEV_KEY)" \
+	--with-weather-dev-key="$(NEUTRINO_WEATHER_DEV_KEY)" \
+	\
+	--with-target=cdk \
+	--with-targetprefix=$(prefix) \
+	--with-boxtype=$(BOXTYPE)
+
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2))
+  NEUTRINO_CONF_OPTS += --with-boxmodel=$(BOXSERIES)
+else
+  NEUTRINO_CONF_OPTS += --with-boxmodel=$(BOXMODEL)
 endif
 
 # -----------------------------------------------------------------------------
 
-N_OMDB_API_KEY ?= 20711f9e
-N_SHOUTCAST_DEV_KEY ?= fa1669MuiRPorUBw
-N_TMDB_DEV_KEY ?= 7270f1b571c4ecbb5b204ddb7f8939b1
-N_YOUTUBE_DEV_KEY ?= AIzaSyBLdZe7M3rpNMZqSj-3IEvjbb2hATWJIdM
-N_WEATHER_DEV_KEY ?=
-
-# -----------------------------------------------------------------------------
+ifeq ($(BOXTYPE), coolstream)
+  NEUTRINO_DEPS += coolstream-drivers
+  ifeq ($(HAS_LIBCS), yes)
+    NEUTRINO_DEPS += libcoolstream
+    ifeq ($(DEBUG), yes)
+      NEUTRINO_CONF_OPTS += \
+	--enable-libcoolstream-static \
+	--with-libcoolstream-static-dir=$(TARGET_libdir)
+    endif
+  endif
 
-ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2))
-  N_BOXMODEL = $(BOXSERIES)
+  NEUTRINO_CONF_OPTS += --enable-pip
 else
-  N_BOXMODEL = $(BOXMODEL)
+  NEUTRINO_DEPS += libstb-hal
+  NEUTRINO_CONF_OPTS += \
+	--with-stb-hal-includes=$(SOURCE_DIR)/$(NI-LIBSTB-HAL)/include \
+	--with-stb-hal-build=$(LIBSTB-HAL_BUILD_DIR)
+
+  ifeq ($(BOXTYPE), armbox)
+    NEUTRINO_CONF_OPTS += --disable-arm-acc
+  endif
+  ifeq ($(BOXTYPE), mipsbox)
+    NEUTRINO_CONF_OPTS += --disable-mips-acc
+  endif
 endif
 
-# -----------------------------------------------------------------------------
+# enable ffmpeg audio decoder in neutrino
+NEUTRINO_AUDIODEC = ffmpeg
 
-N_MAKE_ENV = \
-	$(MAKE_OPTS) \
-	\
-	CFLAGS="$(N_CFLAGS)" \
-	CPPFLAGS="$(N_CFLAGS)" \
-	CXXFLAGS="$(N_CFLAGS) -std=c++11" \
-	LDFLAGS="$(N_LDFLAGS)"
+ifeq ($(NEUTRINO_AUDIODEC), ffmpeg)
+  NEUTRINO_CONF_OPTS += --enable-ffmpegdec
+else
+  NEUTRINO_DEPS += libid3tag
+  NEUTRINO_DEPS += libmad
 
-N_MAKE_ENV += \
-	PKG_CONFIG=$(PKG_CONFIG) \
-	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
+  NEUTRINO_DEPS += libvorbisidec
+  NEUTRINO_CONF_OPTS += --with-tremor
+
+  NEUTRINO_DEPS += flac
+  NEUTRINO_CONF_OPTS += --enable-flac
+endif
 
 # -----------------------------------------------------------------------------
 
-$(N_OBJ_DIR)/config.status: $(N_DEPS)
-	test -d $(N_OBJ_DIR) || mkdir -p $(N_OBJ_DIR)
+$(NEUTRINO_BUILD_DIR)/config.status: $(NEUTRINO_DEPS)
+	test -d $(NEUTRINO_BUILD_DIR) || mkdir -p $(NEUTRINO_BUILD_DIR)
 	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \
 		git checkout $(NI-NEUTRINO_BRANCH)
 	$(SOURCE_DIR)/$(NI-NEUTRINO)/autogen.sh
-	$(CD) $(N_OBJ_DIR); \
-		$(N_MAKE_ENV) \
+	$(CD) $(NEUTRINO_BUILD_DIR); \
+		$(NEUTRINO_CONF_ENV) \
 		$(SOURCE_DIR)/$(NI-NEUTRINO)/configure \
-			--host=$(TARGET) \
-			--build=$(BUILD) \
-			--prefix=$(prefix) \
-			$(N_CONFIGURE_DEBUG) \
-			--enable-maintainer-mode \
-			--enable-silent-rules \
-			\
-			$(N_CONFIGURE_ADDITIONS) \
-			--enable-ffmpegdec \
-			--enable-flac \
-			--enable-freesatepg \
-			--enable-fribidi \
-			--enable-giflib \
-			--enable-lua \
-			--enable-mdev \
-			--enable-pugixml \
-			\
-			--with-omdb-api-key="$(N_OMDB_API_KEY)" \
-			--with-shoutcast-dev-key="$(N_SHOUTCAST_DEV_KEY)" \
-			--with-tmdb-dev-key="$(N_TMDB_DEV_KEY)" \
-			--with-youtube-dev-key="$(N_YOUTUBE_DEV_KEY)" \
-			--with-weather-dev-key="$(N_WEATHER_DEV_KEY)" \
-			\
-			$(N_CONFIGURE_LIBSTB-HAL) \
-			--with-tremor \
-			--with-target=cdk \
-			--with-targetprefix=$(prefix) \
-			--with-boxtype=$(BOXTYPE) \
-			--with-boxmodel=$(N_BOXMODEL)
+			$(NEUTRINO_CONF_OPTS)
 
 # -----------------------------------------------------------------------------
 
-neutrino: $(N_OBJ_DIR)/config.status
+neutrino: $(NEUTRINO_BUILD_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	$(MAKE) -C $(N_OBJ_DIR) all     DESTDIR=$(TARGET_DIR)
-	$(MAKE) -C $(N_OBJ_DIR) install DESTDIR=$(N_INST_DIR)
+	$(MAKE) -C $(NEUTRINO_BUILD_DIR) all     DESTDIR=$(TARGET_DIR)
+	$(MAKE) -C $(NEUTRINO_BUILD_DIR) install DESTDIR=$(NEUTRINO_INST_DIR)
 	$(MAKE) $(TARGET_sysconfdir)/init.d/start_neutrino
 	$(TOUCH)
 
@@ -192,40 +179,51 @@ $(TARGET_sysconfdir)/init.d/start_neutrino:
 
 # -----------------------------------------------------------------------------
 
-LH_OBJ_DIR = $(BUILD_DIR)/$(NI-LIBSTB-HAL)
+LIBSTB-HAL_DEPS  =
+LIBSTB-HAL_DEPS += ffmpeg
+LIBSTB-HAL_DEPS += openthreads
+
+# -----------------------------------------------------------------------------
+
+LIBSTB-HAL_CONF_ENV = \
+	$(NEUTRINO_CONF_ENV)
 
 # -----------------------------------------------------------------------------
 
-LH_DEPS  =
-LH_DEPS += ffmpeg
-LH_DEPS += openthreads
+LIBSTB-HAL_CONF_OPTS = \
+	--host=$(TARGET) \
+	--build=$(BUILD) \
+	--prefix=$(prefix) \
+	--enable-maintainer-mode \
+	--enable-silent-rules \
+	--enable-shared=no \
+	\
+	--with-target=cdk \
+	--with-targetprefix=$(prefix) \
+	--with-boxtype=$(BOXTYPE)
+
+ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2))
+  LIBSTB-HAL_CONF_OPTS += --with-boxmodel=$(BOXSERIES)
+else
+  LIBSTB-HAL_CONF_OPTS += --with-boxmodel=$(BOXMODEL)
+endif
 
 # -----------------------------------------------------------------------------
 
-$(LH_OBJ_DIR)/config.status: $(LH_DEPS)
-	test -d $(LH_OBJ_DIR) || mkdir -p $(LH_OBJ_DIR)
+$(LIBSTB-HAL_BUILD_DIR)/config.status: $(LIBSTB-HAL_DEPS)
+	test -d $(LIBSTB-HAL_BUILD_DIR) || mkdir -p $(LIBSTB-HAL_BUILD_DIR)
 	$(SOURCE_DIR)/$(NI-LIBSTB-HAL)/autogen.sh
-	$(CD) $(LH_OBJ_DIR); \
-		$(N_MAKE_ENV) \
+	$(CD) $(LIBSTB-HAL_BUILD_DIR); \
+		$(LIBSTB-HAL_CONF_ENV) \
 		$(SOURCE_DIR)/$(NI-LIBSTB-HAL)/configure \
-			--host=$(TARGET) \
-			--build=$(BUILD) \
-			--prefix=$(prefix) \
-			--enable-maintainer-mode \
-			--enable-silent-rules \
-			--enable-shared=no \
-			\
-			--with-target=cdk \
-			--with-targetprefix=$(prefix) \
-			--with-boxtype=$(BOXTYPE) \
-			--with-boxmodel=$(N_BOXMODEL)
+			$(LIBSTB-HAL_CONF_OPTS)
 
 # -----------------------------------------------------------------------------
 
-libstb-hal: $(LH_OBJ_DIR)/config.status
+libstb-hal: $(LIBSTB-HAL_BUILD_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	$(MAKE) -C $(LH_OBJ_DIR) all     DESTDIR=$(TARGET_DIR)
-	$(MAKE) -C $(LH_OBJ_DIR) install DESTDIR=$(N_INST_DIR)
+	$(MAKE) -C $(LIBSTB-HAL_BUILD_DIR) all     DESTDIR=$(TARGET_DIR)
+	$(MAKE) -C $(LIBSTB-HAL_BUILD_DIR) install DESTDIR=$(NEUTRINO_INST_DIR)
 	$(REWRITE_LIBTOOL_LA)
 	$(TOUCH)
 
@@ -235,10 +233,10 @@ neutrino-bin:
 ifeq ($(CLEAN), yes)
 	$(MAKE) neutrino-clean
 endif
-	$(MAKE) $(N_OBJ_DIR)/config.status
+	$(MAKE) $(NEUTRINO_BUILD_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	$(MAKE) -C $(N_OBJ_DIR) all DESTDIR=$(TARGET_DIR)
-	$(INSTALL_EXEC) -D $(N_OBJ_DIR)/src/neutrino $(TARGET_bindir)/neutrino
+	$(MAKE) -C $(NEUTRINO_BUILD_DIR) all DESTDIR=$(TARGET_DIR)
+	$(INSTALL_EXEC) -D $(NEUTRINO_BUILD_DIR)/src/neutrino $(TARGET_bindir)/neutrino
 ifneq ($(DEBUG), yes)
 	$(TARGET_STRIP) $(TARGET_bindir)/neutrino
 endif
@@ -247,33 +245,33 @@ endif
 # -----------------------------------------------------------------------------
 
 neutrino-uninstall:
-	-make -C $(N_OBJ_DIR) uninstall DESTDIR=$(TARGET_DIR)
+	-make -C $(NEUTRINO_BUILD_DIR) uninstall DESTDIR=$(TARGET_DIR)
 
 neutrino-distclean:
-	-make -C $(N_OBJ_DIR) distclean
+	-make -C $(NEUTRINO_BUILD_DIR) distclean
 
 neutrino-clean: neutrino-uninstall neutrino-distclean
-	rm -f $(N_OBJ_DIR)/config.status
+	rm -f $(NEUTRINO_BUILD_DIR)/config.status
 	rm -f $(DEPS_DIR)/neutrino
 	rm -f $(TARGET_sysconfdir)/init.d/start_neutrino
 
 neutrino-clean-all: neutrino-clean
-	rm -rf $(N_OBJ_DIR)
+	rm -rf $(NEUTRINO_BUILD_DIR)
 
 # -----------------------------------------------------------------------------
 
 libstb-hal-uninstall:
-	-make -C $(LH_OBJ_DIR) uninstall DESTDIR=$(TARGET_DIR)
+	-make -C $(LIBSTB-HAL_BUILD_DIR) uninstall DESTDIR=$(TARGET_DIR)
 
 libstb-hal-distclean:
-	-make -C $(LH_OBJ_DIR) distclean
+	-make -C $(LIBSTB-HAL_BUILD_DIR) distclean
 
 libstb-hal-clean: libstb-hal-uninstall libstb-hal-distclean
-	rm -f $(LH_OBJ_DIR)/config.status
+	rm -f $(LIBSTB-HAL_BUILD_DIR)/config.status
 	rm -f $(DEPS_DIR)/libstb-hal
 
 libstb-hal-clean-all: libstb-hal-clean
-	rm -rf $(LH_OBJ_DIR)
+	rm -rf $(LIBSTB-HAL_BUILD_DIR)
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/target-libs.mk b/make/target-libs.mk
index 143bf10f..ea3df886 100644
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
@@ -1134,7 +1134,7 @@ libvorbisidec: $(LIBVORBISIDEC_DEPS) $(DL_DIR)/$(LIBVORBISIDEC_SOURCE) | $(TARGE
 LIBOGG_VER    = 1.3.4
 LIBOGG_DIR    = libogg-$(LIBOGG_VER)
 LIBOGG_SOURCE = libogg-$(LIBOGG_VER).tar.gz
-LIBOGG_SITE   = https://ftp.osuosl.org/pub/xiph/releases/ogg
+LIBOGG_SITE   = http://downloads.xiph.org/releases/ogg
 
 $(DL_DIR)/$(LIBOGG_SOURCE):
 	$(DOWNLOAD) $(LIBOGG_SITE)/$(LIBOGG_SOURCE)