diff --git a/README.md b/README.md
index 72cccb0b..7077c0ea 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,6 @@ make images
 
 ## 7) Aktualisieren und aufräumen
 ```bash
-make update-all
+make update
 make clean
 ```
diff --git a/make/buildsystem-clean.mk b/make/buildsystem-clean.mk
index c5348b3e..82a832dc 100644
--- a/make/buildsystem-clean.mk
+++ b/make/buildsystem-clean.mk
@@ -37,7 +37,7 @@ ccache-clean:
 	@echo "Clearing $$CCACHE_DIR"
 	@$(CCACHE) -C
 
-rebuild-clean: host-bin-config-clean target-clean deps-clean build-clean
+rebuild-clean: host-bin-config-clean target-clean deps-clean build-clean checkout-branches
 
 all-clean: rebuild-clean staging-clean host-clean static-base-clean
 	@echo -e "\n$(TERM_RED_BOLD)Any other key then CTRL-C will now remove CROSS_BASE$(TERM_NORMAL)"
diff --git a/make/buildsystem-prerequisites.mk b/make/buildsystem-prerequisites.mk
index f6fa7889..176847eb 100644
--- a/make/buildsystem-prerequisites.mk
+++ b/make/buildsystem-prerequisites.mk
@@ -49,7 +49,7 @@ bashcheck:
 
 # -----------------------------------------------------------------------------
 
-preqs: download ni-sources
+preqs: download ni-sources checkout-branches
 
 $(CCACHE):
 	$(call draw_line);
@@ -101,8 +101,6 @@ $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM):
 ifeq ($(HAS_LIBCS),yes)
 	$(CD) $(SOURCE_DIR); \
 		git clone $(NI-PRIVATE)/$(@F).git
-	$(CD) $(@); \
-		git checkout $(NI-LIBCOOLSTREAM_BRANCH)
 endif
 
 # upstream for rebase
@@ -170,6 +168,11 @@ ni-sources: $(SOURCE_DIR) \
 	$(SOURCE_DIR)/$(NI-RTMPDUMP) \
 	$(SOURCE_DIR)/$(NI-STREAMRIPPER)
 
+checkout-branches:
+	$(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git checkout $(FFMPEG_BRANCH)
+	$(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); git checkout $(KERNEL_BRANCH)
+	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); git checkout $(NEUTRINO_BRANCH)
+
 # -----------------------------------------------------------------------------
 
 PHONY += init
diff --git a/make/buildsystem-update.mk b/make/buildsystem-update.mk
index 4ca8e28f..b04f2763 100644
--- a/make/buildsystem-update.mk
+++ b/make/buildsystem-update.mk
@@ -13,14 +13,14 @@ endif
 update-neutrino:
 	export GIT_MERGE_AUTOEDIT=no; \
 	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \
-		git checkout $(NI-NEUTRINO_BRANCH); \
-		git pull origin $(NI-NEUTRINO_BRANCH)
+		git checkout master; \
+		git pull --all
 
 update-remotes:
 ifeq ($(NI_ADMIN),true)
 	export GIT_MERGE_AUTOEDIT=no; \
 	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \
-		git checkout $(NI-NEUTRINO_BRANCH); \
+		git checkout master; \
 		git fetch --all
 	$(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); \
 		git checkout master; \
@@ -43,29 +43,27 @@ update-ni-force:
 	make ni-sources
 	make update-ni-sources
 
-update-ni-sources: ni-sources
+update-ni-sources: ni-sources update-neutrino
 	$(CD) $(BUILD-GENERIC-PC); git pull
 	$(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN); git pull
-	$(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git pull --all; git checkout $(NI-FFMPEG_BRANCH)
+	$(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git pull --all
 ifeq ($(HAS_LIBCS),yes)
-	$(CD) $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM); git pull --all; git checkout $(NI-LIBCOOLSTREAM_BRANCH)
+	$(CD) $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM); git pull
 endif
 	$(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); git pull
-	$(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); git pull --all; git checkout $(KERNEL_BRANCH)
+	$(CD) $(SOURCE_DIR)/$(NI-LINUX-KERNEL); git pull --all
 	$(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF); git pull
 	$(CD) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS); git pull
 	$(CD) $(SOURCE_DIR)/$(NI-OFGWRITE); git pull
 	$(CD) $(SOURCE_DIR)/$(NI-OPENTHREADS); git pull
 	$(CD) $(SOURCE_DIR)/$(NI-RTMPDUMP); git pull
 	$(CD) $(SOURCE_DIR)/$(NI-STREAMRIPPER); git pull
+	make checkout-branches
 
-update-ni:
-	make update-self
-	make update-neutrino
-	make update-ni-sources
+update: update-self update-ni-sources
 
 pull \
-update-all: update-ni update-remotes
+update-all: update update-remotes
 
 push:
 	git push
diff --git a/make/environment-build.mk b/make/environment-build.mk
index 5cec4f8c..292eb9fc 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -394,12 +394,12 @@ NI-PUBLIC		= $(GITHUB)/neutrino-images
 NI-PRIVATE		= $(BITBUCKET_SSH):neutrino-images
 
 NI-NEUTRINO		= ni-neutrino
-NI-NEUTRINO_BRANCH	?= master
 NI-NEUTRINO-PLUGINS	= ni-neutrino-plugins
 
 BUILD-GENERIC-PC	= build-generic-pc
 NI-BUILD-GENERIC-PC	= ni-build-generic-pc
 NI-DRIVERS-BIN		= ni-drivers-bin
+NI-FFMPEG		= ni-ffmpeg
 NI-LIBSTB-HAL		= ni-libstb-hal
 NI-LINUX-KERNEL		= ni-linux-kernel
 NI-LOGO-STUFF		= ni-logo-stuff
@@ -407,12 +407,3 @@ NI-OFGWRITE		= ni-ofgwrite
 NI-OPENTHREADS		= ni-openthreads
 NI-RTMPDUMP		= ni-rtmpdump
 NI-STREAMRIPPER		= ni-streamripper
-
-# Note: NI-FFMPEG-variables are only used for Coolstream-builds
-#
-# ffmpeg/master is currently not mature enough for daily use
-# if you want to help testing you can enable it here
-NI-FFMPEG		= ni-ffmpeg
-NI-FFMPEG_BRANCH	?= ni/ffmpeg/2.8
-#NI-FFMPEG_BRANCH	?= ni/ffmpeg/master
-#NI-FFMPEG_BRANCH	?= ffmpeg/master
diff --git a/make/target-blobs.mk b/make/target-blobs.mk
index f7c550dc..723691b6 100644
--- a/make/target-blobs.mk
+++ b/make/target-blobs.mk
@@ -130,7 +130,7 @@ kronos_v2-drivers \
 coolstream-drivers: $(SOURCE_DIR)/$(NI-DRIVERS-BIN) | $(TARGET_DIR)
 	mkdir -p $(TARGET_libdir)
 	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib/. $(TARGET_libdir)
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/libcoolstream/$(shell echo -n $(NI-FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_libdir)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/libcoolstream/$(shell echo -n $(FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_libdir)
 ifeq ($(BOXMODEL),nevis)
 	ln -sf libnxp.so $(TARGET_libdir)/libconexant.so
 endif
diff --git a/make/target-ffmpeg-coolstream.mk b/make/target-ffmpeg-coolstream.mk
index 30834a44..fac6a748 100644
--- a/make/target-ffmpeg-coolstream.mk
+++ b/make/target-ffmpeg-coolstream.mk
@@ -3,11 +3,14 @@
 #
 # -----------------------------------------------------------------------------
 
+FFMPEG_BRANCH ?= ni/ffmpeg/2.8
+#FFMPEG_BRANCH ?= ffmpeg/master
+
 FFMPEG_DEPS = openssl rtmpdump libbluray libass
 
 # -----------------------------------------------------------------------------
 
-ifeq ($(NI-FFMPEG_BRANCH),ni/ffmpeg/2.8)
+ifeq ($(FFMPEG_BRANCH),ni/ffmpeg/2.8)
   FFMPEG_DEPS += libroxml
   FFMPEG_CONFIGURE_BRANCH =
 else
@@ -173,7 +176,7 @@ endif
 ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(NI-FFMPEG)
 	$(CD) $(SOURCE_DIR)/$(NI-FFMPEG); \
-		git checkout $(NI-FFMPEG_BRANCH)
+		git checkout $(FFMPEG_BRANCH)
 	tar -C $(SOURCE_DIR) -cp $(NI-FFMPEG) --exclude-vcs | tar -C $(BUILD_DIR) -x
 	$(CHDIR)/$(NI-FFMPEG); \
 		./configure \
diff --git a/make/target-neutrino.mk b/make/target-neutrino.mk
index 23f6fd95..2fe3fae6 100644
--- a/make/target-neutrino.mk
+++ b/make/target-neutrino.mk
@@ -8,6 +8,12 @@ NEUTRINO_INST_DIR ?= $(TARGET_DIR)
 NEUTRINO_OBJ       = $(NI-NEUTRINO)-obj
 NEUTRINO_BUILD_DIR = $(BUILD_DIR)/$(NEUTRINO_OBJ)
 
+ifeq ($(BOXTYPE),coolstream)
+  NEUTRINO_BRANCH = ni/$(BOXTYPE)
+else
+  NEUTRINO_BRANCH ?= master
+endif
+
 LIBSTB-HAL_OBJ       = $(NI-LIBSTB-HAL)-obj
 LIBSTB-HAL_BUILD_DIR = $(BUILD_DIR)/$(LIBSTB-HAL_OBJ)
 
@@ -169,7 +175,7 @@ endif
 $(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)
+		git checkout $(NEUTRINO_BRANCH)
 	$(SOURCE_DIR)/$(NI-NEUTRINO)/autogen.sh
 	$(CD) $(NEUTRINO_BUILD_DIR); \
 		$(NEUTRINO_CONF_ENV) \