diff --git a/Makefile b/Makefile
index e0c43747f..5f1fcca43 100644
--- a/Makefile
+++ b/Makefile
@@ -390,7 +390,7 @@ install:
 	install -d $(DESTDIR)$(PREFIX)/lib/carla/
 	install -d $(DESTDIR)$(PREFIX)/lib/carla/styles/
 	install -d $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
-	install -d $(DESTDIR)$(PREFIX)/lib/vst/
+	install -d $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/
 	install -d $(DESTDIR)$(PREFIX)/lib/pkgconfig/
 	install -d $(DESTDIR)$(PREFIX)/include/carla/
 	install -d $(DESTDIR)$(PREFIX)/include/carla/includes/
@@ -469,9 +469,9 @@ endif
 	install -m 644 \
 		bin/CarlaRack*.* \
 		bin/CarlaPatchbay*.* \
-		$(DESTDIR)$(PREFIX)/lib/vst/
+		$(DESTDIR)$(PREFIX)/lib/vst/carla.vst/
 
-	# Install binaries (backend)
+	# Install other binaries
 	install -m 755 \
 		bin/*bridge-* \
 		bin/carla-discovery-* \
@@ -503,7 +503,7 @@ endif
 		source/includes/CarlaDefines.h \
 		$(DESTDIR)$(PREFIX)/include/carla/includes/
 
-	# Install resources (main)
+	# Install resources
 	install -m 755 \
 		bin/resources/carla-plugin \
 		bin/resources/carla-plugin-patchbay \
@@ -560,22 +560,23 @@ endif
 	$(LINK) $(PREFIX)/share/carla/ui_carla_settings_driver.py $(DESTDIR)$(PREFIX)/share/carla/resources/
 	$(LINK) $(PREFIX)/share/carla/ui_inputdialog_value.py     $(DESTDIR)$(PREFIX)/share/carla/resources/
 
-	# Link binaries for lv2 plugin
+	# Link binaries for lv2 & vst plugin
 	@for i in $(shell find $(DESTDIR)$(PREFIX)/lib/carla/ -maxdepth 1 -type f -exec basename {} ';'); do \
 		$(LINK) $(PREFIX)/lib/carla/$$i $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/; \
+		$(LINK) $(PREFIX)/lib/carla/$$i $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/; \
 	done
 	rm -f $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/libcarla_*.*
+	rm -f $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/libcarla_*.*
 
-	# Link styles for lv2 plugin
-	$(LINK) $(PREFIX)/lib/carla/styles/ $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
+	# Link styles for lv2 & vst plugin
+	$(LINK) $(PREFIX)/lib/carla/styles $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
+	$(LINK) $(PREFIX)/lib/carla/styles $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/
 
-	# Link resources for lv2 plugin
+	# Link resources for lv2 & vst plugin
 	rm -rf $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/resources
+	rm -rf $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/resources
 	$(LINK) $(PREFIX)/share/carla/resources/ $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
-
-	# Link resources for vst plugin
-	rm -rf $(DESTDIR)$(PREFIX)/lib/vst/carla-resources
-	$(LINK) $(PREFIX)/lib/lv2/carla.lv2/resources $(DESTDIR)$(PREFIX)/lib/vst/carla-resources
+	$(LINK) $(PREFIX)/share/carla/resources/ $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/
 
 	# Adjust PREFIX value in script files
 	sed -i "s?X-PREFIX-X?$(PREFIX)?" \
@@ -593,8 +594,6 @@ endif
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/carla*
-	rm -f $(DESTDIR)$(PREFIX)/lib/vst/CarlaRack*.*
-	rm -f $(DESTDIR)$(PREFIX)/lib/vst/CarlaPatchbay*.*
 	rm -f $(DESTDIR)$(PREFIX)/lib/pkgconfig/carla-standalone.pc
 	rm -f $(DESTDIR)$(PREFIX)/share/applications/carla.desktop
 	rm -f $(DESTDIR)$(PREFIX)/share/applications/carla-control.desktop
@@ -606,7 +605,7 @@ uninstall:
 	rm -rf $(DESTDIR)$(PREFIX)/include/carla/
 	rm -rf $(DESTDIR)$(PREFIX)/lib/carla/
 	rm -rf $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
-	rm -rf $(DESTDIR)$(PREFIX)/lib/vst/carla-resources
+	rm -rf $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/
 	rm -rf $(DESTDIR)$(PREFIX)/share/carla/
 
 # --------------------------------------------------------------
diff --git a/source/backend/engine/CarlaEngineNative.cpp b/source/backend/engine/CarlaEngineNative.cpp
index 843a2b191..8550fa0b5 100644
--- a/source/backend/engine/CarlaEngineNative.cpp
+++ b/source/backend/engine/CarlaEngineNative.cpp
@@ -617,13 +617,7 @@ public:
             delete[] pData->options.binaryDir;
 
         pData->options.resourceDir = carla_strdup(pHost->resourceDir);
-
-#ifndef CARLA_PLUGIN_EXPORT
-        if (gNeedsJuceHandling)
-            pData->options.binaryDir = carla_strdup(carla_get_library_folder());
-        else
-#endif
-            pData->options.binaryDir = carla_strdup(File(pHost->resourceDir).getParentDirectory().getFullPathName().toRawUTF8());
+        pData->options.binaryDir   = carla_strdup(carla_get_library_folder());
 
         setCallback(_ui_server_callback, this);
     }
diff --git a/source/carla_database.py b/source/carla_database.py
index 8a6724506..993d07a95 100755
--- a/source/carla_database.py
+++ b/source/carla_database.py
@@ -134,7 +134,7 @@ def findFilenames(filePath, stype):
 # ------------------------------------------------------------------------------------------------------------
 # Plugin Query
 
-PLUGIN_QUERY_API_VERSION = 5
+PLUGIN_QUERY_API_VERSION = 6
 
 PyPluginInfo = {
     'API': PLUGIN_QUERY_API_VERSION,