diff --git a/Makefile b/Makefile
index 464d876d..c0545318 100755
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,6 @@
 #
 # -----------------------------------------------------------------------------
 
-MAINTAINER ?= unknown
-
 UID := $(shell id -u)
 ifeq ($(UID),0)
 warn:
@@ -43,8 +41,7 @@ export SHELL CONFIG_SHELL
 # first target is default ...
 default: all
 
-local-files: config.local Makefile.local
-	@mkdir -p local/{root,scripts}
+local-files: config.local Makefile.local local
 
 # workaround unset variables at first start
 config.local: $(eval BOXMODEL=hd51)
@@ -103,19 +100,14 @@ config.local: $(eval BOXMODEL=hd51)
 		51)	boxmodel=vuduo;; \
 		*)	boxmodel=hd51;; \
 	esac; \
-	cp config.example $@; \
+	cp support/config.example $@; \
 	sed -i -e "s|^#BOXMODEL = $$boxmodel|BOXMODEL = $$boxmodel|" $@
-	@echo ""
 
 Makefile.local:
-	@cp Makefile.example $@
+	@cp support/Makefile.example $@
 
--include config.local
-include make/environment-box.mk
-include make/environment-linux.mk
-include make/environment-build.mk
-include make/environment-image.mk
-include make/environment-update.mk
+local:
+	@mkdir -p $(@)/{root,scripts}
 
 printenv:
 	$(call draw_line);
@@ -174,8 +166,21 @@ help:
 	@echo "                     but doesn't touch your local stuff"
 	$(call draw_line);
 
+all:
+	@echo "'make all' is not a valid target."
+
+# target for testing only. not useful otherwise
+everything: $(shell sed -n 's/^\$$.D.\/\(.*\):.*/\1/p' make/*.mk)
+
 # -----------------------------------------------------------------------------
 
+-include config.local
+include make/environment-box.mk
+include make/environment-linux.mk
+include make/environment-build.mk
+include make/environment-image.mk
+include make/environment-update.mk
+
 -include internal/internal.mk
 
 include make/buildsystem-bootstrap.mk
@@ -207,25 +212,18 @@ include make/host-tools.mk
 include make/ni.mk
 
 # for your local extensions, e.g. special plugins or similar ...
-# put them into $(BASE_DIR)/local since that is ignored in .gitignore
 -include ./Makefile.local
 
-all:
-	@echo "'make all' is not a valid target. Please read the documentation."
+# Quotes are needed for spaces and all in the original PATH content.
+PATH := "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(CROSS_DIR)/bin:$(PATH)"
 
-done:
-	$(call draw_line);
-	@echo -e "$(TERM_GREEN)Done$(TERM_NORMAL)"
-	$(call draw_line);
-
-# target for testing only. not useful otherwise
-everything: $(shell sed -n 's/^\$$.D.\/\(.*\):.*/\1/p' make/*.mk)
+# -----------------------------------------------------------------------------
 
 .print-phony:
 	@echo $(PHONY)
 
 PHONY += local-files
-PHONY += printenv help done all everything
+PHONY += printenv help all everything
 PHONY += .print-phony
 .PHONY: $(PHONY)
 
diff --git a/make/buildsystem-helpers.mk b/make/buildsystem-helpers.mk
index 0e19e6bf..b9204eb1 100644
--- a/make/buildsystem-helpers.mk
+++ b/make/buildsystem-helpers.mk
@@ -157,4 +157,12 @@ changelogs:
 
 # -----------------------------------------------------------------------------
 
+done:
+	$(call draw_line);
+	@echo -e "$(TERM_GREEN)Done$(TERM_NORMAL)"
+	$(call draw_line);
+
+# -----------------------------------------------------------------------------
+
 PHONY += changelogs
+PHONY += done
diff --git a/make/environment-build.mk b/make/environment-build.mk
index ebbc0fec..fef30722 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -98,7 +98,6 @@ endif
 # -----------------------------------------------------------------------------
 
 BASE_DIR     := $(shell pwd)
-WHOAMI       := $(shell id -un)
 DL_DIR        = $(BASE_DIR)/download
 BUILD_DIR     = $(BASE_DIR)/build_tmp
 ROOTFS        = $(BUILD_DIR)/rootfs
@@ -127,6 +126,8 @@ TARGET_FILES  = $(BASE_DIR)/skel-root/general
 PACKAGE_DIR   = $(BASE_DIR)/package
 SUPPORT_DIR   = $(BASE_DIR)/support
 
+MAINTAINER   ?= unknown
+
 # -----------------------------------------------------------------------------
 
 include make/environment-host.mk
@@ -181,8 +182,6 @@ GNU_HOST_NAME  := $(shell support/gnuconfig/config.guess)
 # search path(s) for all prerequisites
 VPATH = $(DEPS_DIR) $(HOST_DEPS_DIR)
 
-PATH := $(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(CROSS_DIR)/bin:$(PATH)
-
 # -----------------------------------------------------------------------------
 
 PKG_CONFIG = $(HOST_DIR)/bin/$(TARGET)-pkg-config
diff --git a/Makefile.example b/support/Makefile.example
similarity index 100%
rename from Makefile.example
rename to support/Makefile.example
diff --git a/config.example b/support/config.example
similarity index 91%
rename from config.example
rename to support/config.example
index 4428b971..ea2175d4 100644
--- a/config.example
+++ b/support/config.example
@@ -56,11 +56,11 @@ MAINTAINER = $(shell whoami)
 # -----------------------------------------------------------------------------
 
 # Neutrino API keys
-#N_OMDB_API_KEY =
-#N_SHOUTCAST_DEV_KEY =
-#N_TMDB_DEV_KEY =
-#N_YOUTUBE_DEV_KEY =
-#N_WEATHER_DEV_KEY =
+#NEUTRINO_OMDB_API_KEY =
+#NEUTRINO_SHOUTCAST_DEV_KEY =
+#NEUTRINO_TMDB_DEV_KEY =
+#NEUTRINO_YOUTUBE_DEV_KEY =
+#NEUTRINO_WEATHER_DEV_KEY =
 
 # -----------------------------------------------------------------------------