diff --git a/.gitmodules b/.gitmodules
index cd24d87..f9eabc4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -72,4 +72,4 @@
 	url = git@github.com:Xenakios/Atelier.git
 [submodule "plugins/mscHack"]
 	path = plugins/mscHack
-	url = https://github.com/mschack/VCV-Rack-Plugins.git
+	url = https://github.com/CardinalModules/mscHack.git
diff --git a/plugins/Makefile b/plugins/Makefile
index 3d950e7..7dc6bd8 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -438,6 +438,9 @@ MINDMELD_CUSTOM = printNote
 
 PLUGIN_FILES += $(wildcard mscHack/src/*.cpp)
 
+# modules/types which are present in other plugins
+MSCHACK_CUSTOM_PER_FILE = MAIN_SYNC_CLOCK FILTER_PARAM_STRUCT OSC_PARAM_STRUCT PHRASE_CHANGE_STRUCT
+
 # --------------------------------------------------------------
 # rackwindows
 
@@ -909,7 +912,8 @@ $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
-		$(foreach m,$(MINDMELD_CUSTOM),$(call custom_module_names,$(m),JW)) \
+		$(foreach m,$(MSCHACK_CUSTOM),$(call custom_module_names,$(m),mscHack)) \
+		$(foreach m,$(MSCHACK_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),mscHack_$(shell basename $*))) \
 		-DthePlugin=pluginInstance__mscHack \
 		-Dinit=init__mscHack
 
diff --git a/plugins/res/mscHack b/plugins/res/mscHack
new file mode 120000
index 0000000..b93e239
--- /dev/null
+++ b/plugins/res/mscHack
@@ -0,0 +1 @@
+../mscHack/res
\ No newline at end of file