diff --git a/source/Makefile.mk b/source/Makefile.mk
index a100e3197..c8d1430a6 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -304,6 +304,15 @@ else
 SILENT = @
 endif
 
+# ---------------------------------------------------------------------------------------------------------------------
+# Set combined object CLI arg
+
+ifeq ($(MACOS),true)
+COMBINE = -r -keep_private_externs
+else
+COMBINE = -r
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 # Set shared library CLI arg
 
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index 389dd77ee..312089cf2 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -61,7 +61,11 @@ endif
 
 LIBS  = $(MODULEDIR)/carla_engine_plugin.a
 LIBS += $(MODULEDIR)/carla_plugin.a
+ifeq ($(STATIC_PLUGIN_TARGET),true)
+LIBS += $(MODULEDIR)/jackbridge.min.a
+else
 LIBS += $(MODULEDIR)/jackbridge.a
+endif
 
 LIBS += $(MODULEDIR)/lilv.a
 LIBS += $(MODULEDIR)/rtmempool.a
@@ -73,10 +77,12 @@ LIBS += $(MODULEDIR)/sfzero.a
 LIBS += $(MODULEDIR)/zita-resampler.a
 
 ifeq ($(HAVE_DGL),true)
-ifneq ($(USING_CUSTOM_DPF),true)
-LIBS += $(MODULEDIR)/dgl.a
-else
+ifeq ($(STATIC_PLUGIN_TARGET)$(USING_CUSTOM_DPF),truetrue)
+# nothing
+else ifeq ($(USING_CUSTOM_DPF),true)
 LIBS += $(CUSTOM_DPF_PATH)/build/libdgl-opengl.a
+else
+LIBS += $(MODULEDIR)/dgl.a
 endif
 endif
 
@@ -251,7 +257,7 @@ else
 wine: $(BINDIR)/CarlaVstShellBridged.dll.so $(BINDIR)/CarlaVstFxShellBridged.dll.so
 endif
 
-static: $(OBJDIR)/carla-host-plugin.cpp.o
+static: $(BINDIR)/libcarla_host-plugin.a
 
 # ---------------------------------------------------------------------------------------------------------------------
 
@@ -294,6 +300,19 @@ $(BINDIR)/libcarla_host-plugin$(LIB_EXT): $(OBJDIR)/carla-host-plugin.cpp.o $(LI
 
 # ---------------------------------------------------------------------------------------------------------------------
 
+$(BINDIR)/libcarla_host-plugin.a: $(OBJDIR)/libcarla_host-plugin.o
+	-@mkdir -p $(BINDIR)
+	@echo "Creating libcarla_host-plugin.a"
+	$(SILENT)rm -f $@
+	$(SILENT)$(AR) crs $@ $^
+
+$(OBJDIR)/libcarla_host-plugin.o: $(OBJDIR)/carla-host-plugin.cpp.o $(LIBS) $(LIBS_juce)
+	-@mkdir -p $(BINDIR)
+	@echo "Linking libcarla-host-plugin.o"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(LIBS_START) $(LIBS) $(LIBS_juce) $(LIBS_END) $(COMBINE) -o $@
+
+# ---------------------------------------------------------------------------------------------------------------------
+
 $(BINDIR)/carla-native-plugin$(APP_EXT): $(OBJDIR)/carla-native-plugin.cpp.o $(LIBS) $(LIBS_juce)
 	-@mkdir -p $(BINDIR)
 	@echo "Linking carla-native-plugin$(APP_EXT)"