diff --git a/make/environment-target.mk b/make/environment-target.mk
index 5762af88..103ffcf4 100644
--- a/make/environment-target.mk
+++ b/make/environment-target.mk
@@ -5,7 +5,6 @@
 
 BIN		= $(TARGET_DIR)/bin
 ETCINITD	= $(TARGET_DIR)/etc/init.d
-LIBPLUGINS	= $(TARGET_DIR)/lib/tuxbox/plugins
 SBIN		= $(TARGET_DIR)/sbin
 SHAREFLEX	= $(TARGET_DIR)/share/tuxbox/neutrino/flex
 SHAREICONS	= $(TARGET_DIR)/share/tuxbox/neutrino/icons
@@ -18,7 +17,6 @@ VARINITD	= $(TARGET_DIR)/var/etc/init.d
 VARPLUGINS	= $(TARGET_DIR)/var/tuxbox/plugins
 
 $(ETCINITD) \
-$(LIBPLUGINS) \
 $(SBIN) \
 $(SHAREFLEX) \
 $(SHAREICONS) \
diff --git a/make/image-update.mk b/make/image-update.mk
index 6198411b..6af6b303 100644
--- a/make/image-update.mk
+++ b/make/image-update.mk
@@ -82,12 +82,12 @@ u-pr-auto-timer:
 	$(MAKE) u-init
 	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/preinstall.sh $(PREINSTALL_SH)
 	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
-	install -d $(UPDATE_INST_DIR)/lib/tuxbox/plugins
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/lib/tuxbox/plugins/
+	install -d $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins
+	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
 	install -d $(UPDATE_INST_DIR)/var/tuxbox/config
 	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
 	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk
index b03ad957..1d0fd8ff 100644
--- a/make/neutrino-plugins.mk
+++ b/make/neutrino-plugins.mk
@@ -109,10 +109,10 @@ $(D)/channellogos: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(SHAREICONS)
 
 # -----------------------------------------------------------------------------
 
-$(D)/logo-addon: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(LIBPLUGINS)
-	install -m 0755 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.sh $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.cfg $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.png $(LIBPLUGINS)/
+$(D)/logo-addon: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(SHAREPLUGINS)
+	install -m 0755 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.sh $(SHAREPLUGINS)/
+	install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.cfg $(SHAREPLUGINS)/
+	install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-addon/*.png $(SHAREPLUGINS)/
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
@@ -124,12 +124,12 @@ $(D)/doscam-webif-skin:
 
 # -----------------------------------------------------------------------------
 
-$(D)/neutrino-mediathek: $(LIBPLUGINS) | $(TARGET_DIR)
+$(D)/neutrino-mediathek: $(SHAREPLUGINS) | $(TARGET_DIR)
 	$(REMOVE)/mediathek.git
 	get-git-source.sh https://github.com/neutrino-mediathek/mediathek.git $(ARCHIVE)/mediathek.git
 	$(CPDIR)/mediathek.git
 	$(CHDIR)/mediathek.git; \
-		cp -a plugins/* $(LIBPLUGINS)/; \
+		cp -a plugins/* $(SHAREPLUGINS)/; \
 		cp -a share $(TARGET_DIR)
 	$(REMOVE)/mediathek.git
 	$(TOUCH)
@@ -145,7 +145,7 @@ LINKS_PATCH  = links-$(LINKS_VER).patch
 LINKS_PATCH += links-$(LINKS_VER)-ac-prog-cxx.patch
 LINKS_PATCH += links-$(LINKS_VER)-input-$(BOXTYPE).patch
 
-$(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).tar.bz2 $(LIBPLUGINS) | $(TARGET_DIR)
+$(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).tar.bz2 $(SHAREPLUGINS) | $(TARGET_DIR)
 	$(REMOVE)/links-$(LINKS_VER)
 	$(UNTAR)/links-$(LINKS_VER).tar.bz2
 	$(CHDIR)/links-$(LINKS_VER)/intl; \
@@ -173,7 +173,7 @@ $(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	mv -f $(BIN)/links $(LIBPLUGINS)/links.so
+	mv -f $(BIN)/links $(SHAREPLUGINS)/links.so
 	cp -a $(IMAGEFILES)/links/* $(TARGET_DIR)/
 	$(REMOVE)/links-$(LINKS_VER)
 	$(TOUCH)