diff --git a/make/environment.mk b/make/environment.mk
index cac6ac9d..ca3fee76 100644
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -303,6 +303,7 @@ BUILD-GENERIC-PC	= build-generic-pc
 NI_BUILD-GENERIC-PC	= ni-build-generic-pc
 NI_DRIVERS-BIN		= ni-drivers-bin
 NI_LIBSTB-HAL		= ni-libstb-hal
+NI_LIBSTB-HAL-NEXT	= ni-libstb-hal-next
 NI_LINUX-KERNEL		= ni-linux-kernel
 NI_LOGO-STUFF		= ni-logo-stuff
 NI_OFGWRITE		= ni-ofgwrite
@@ -321,6 +322,8 @@ TUXBOX_NEUTRINO_BRANCH	?= master
 TUXBOX_LIBSTB-HAL	= library-stb-hal
 TUXBOX_REMOTE_REPO	= tuxbox
 
+TANGO_REMOTE_REPO	= tango
+
 # execute local scripts
 define local-script
 	@if [ -x $(LOCAL_DIR)/scripts/$(1) ]; then \
diff --git a/make/neutrino.mk b/make/neutrino.mk
index 16041034..ddcd8415 100644
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -85,7 +85,7 @@ N_BUILDENV = \
 
 # finally we can build outside of the source directory
 N_OBJDIR = $(BUILD_TMP)/$(FLAVOUR)
-LH_OBJDIR = $(BUILD_TMP)/libstb-hal
+LH_OBJDIR = $(BUILD_TMP)/$(NI_LIBSTB-HAL-NEXT)
 
 $(N_OBJDIR)/config.status: $(NEUTRINO_DEPS) $(MAKE_DIR)/neutrino.mk
 	test -d $(N_OBJDIR) || mkdir -p $(N_OBJDIR)
@@ -128,9 +128,8 @@ endif
 			--with-boxmodel=$(BOXSERIES)
 
 $(LH_OBJDIR)/config.status: $(NEUTRINO_DEPS)
-	# let's use tango's libstb-hal until we have ported the relevant stuff
 	rm -rf $(LH_OBJDIR)
-	git clone https://github.com/TangoCash/libstb-hal-cst-next.git $(LH_OBJDIR)
+	tar -C $(SOURCE_DIR) -cp $(NI_LIBSTB-HAL-NEXT) --exclude-vcs | tar -C $(BUILD_TMP) -x
 	pushd $(LH_OBJDIR) && \
 		./autogen.sh && \
 		\
diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index 9abd46a4..042c9bfe 100644
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -47,6 +47,13 @@ $(SOURCE_DIR)/$(NI_LIBSTB-HAL):
 		git remote add $(TUXBOX_REMOTE_REPO) $(TUXBOX_GIT)/$(TUXBOX_LIBSTB-HAL).git && \
 		git fetch $(TUXBOX_REMOTE_REPO)
 
+$(SOURCE_DIR)/$(NI_LIBSTB-HAL-NEXT):
+	cd $(SOURCE_DIR) && \
+		git clone $(NI_GIT)/$(notdir $@).git
+	cd $@ && \
+		git remote add $(TANGO_REMOTE_REPO) https://github.com/TangoCash/libstb-hal-cst-next.git && \
+		git fetch $(TANGO_REMOTE_REPO)
+
 $(SOURCE_DIR)/$(NI_LIBCOOLSTREAM):
 ifeq ($(HAS_LIBCS), yes)
 	cd $(SOURCE_DIR) && \
@@ -181,6 +188,7 @@ ni-git: \
 	$(SOURCE_DIR)/$(NI_FFMPEG) \
 	$(SOURCE_DIR)/$(NI_LIBCOOLSTREAM) \
 	$(SOURCE_DIR)/$(NI_LIBSTB-HAL) \
+	$(SOURCE_DIR)/$(NI_LIBSTB-HAL-NEXT) \
 	$(SOURCE_DIR)/$(NI_LINUX-KERNEL) \
 	$(SOURCE_DIR)/$(NI_LOGO-STUFF) \
 	$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) \
diff --git a/make/update.mk b/make/update.mk
index 01e35126..124771e7 100644
--- a/make/update.mk
+++ b/make/update.mk
@@ -25,6 +25,10 @@ ifeq ($(NI_ADMIN), true)
 		git checkout master && \
 		git pull $(TUXBOX_REMOTE_REPO) master && \
 		git fetch $(TUXBOX_REMOTE_REPO)
+	cd $(SOURCE_DIR)/$(NI_LIBSTB-HAL-NEXT) && \
+		git checkout master && \
+		git pull $(TANGO_REMOTE_REPO) master && \
+		git fetch $(TANGO_REMOTE_REPO)
 	cd $(SOURCE_DIR)/$(NI_OFGWRITE) && \
 		git checkout master && \
 		git pull upstream master && \
@@ -49,6 +53,7 @@ ifeq ($(HAS_LIBCS), yes)
 	cd $(SOURCE_DIR)/$(NI_LIBCOOLSTREAM) && git pull --all && git checkout $(NI_LIBCOOLSTREAM_BRANCH)
 endif
 	cd $(SOURCE_DIR)/$(NI_LIBSTB-HAL) && git pull
+	cd $(SOURCE_DIR)/$(NI_LIBSTB-HAL-NEXT) && git pull
 	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && git pull --all && git checkout $(KERNEL_BRANCH)
 	cd $(SOURCE_DIR)/$(NI_LOGO-STUFF) && git pull
 	cd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) && git pull
@@ -77,6 +82,7 @@ ifeq ($(HAS_LIBCS), yes)
 	cd $(SOURCE_DIR)/$(NI_LIBCOOLSTREAM) && git push --all
 endif
 	cd $(SOURCE_DIR)/$(NI_LIBSTB-HAL) && git push
+	cd $(SOURCE_DIR)/$(NI_LIBSTB-HAL-NEXT) && git push
 	cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL) && git push --all
 	cd $(SOURCE_DIR)/$(NI_LOGO-STUFF) && git push
 	cd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) && git push