diff --git a/Makefile b/Makefile
index cfa0eadd79..c39c337a0c 100644
--- a/Makefile
+++ b/Makefile
@@ -158,7 +158,8 @@ version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mo
 		rm $${i}.tmp; \
 	done
 
-install: core install-core
+install: core install-engine install-common-mod-files install-default-mods
+	@$(CP) *.sh "$(DATA_INSTALL_DIR)"
 
 install-linux-shortcuts: install-linux-scripts install-linux-icons install-linux-desktop
 
@@ -230,9 +231,6 @@ install-default-mods:
 	@$(INSTALL_PROGRAM) mods/d2k/OpenRA.Mods.D2k.dll "$(DATA_INSTALL_DIR)/mods/d2k"
 	@$(CP_R) mods/modcontent "$(DATA_INSTALL_DIR)/mods/"
 
-install-core: install-engine install-common-mod-files install-default-mods
-	@$(CP) *.sh "$(DATA_INSTALL_DIR)"
-
 install-linux-icons:
 	for SIZE in 16x16 32x32 48x48 64x64 128x128; do \
 		$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/$$SIZE/apps"; \
@@ -370,4 +368,4 @@ help:
 
 .SUFFIXES:
 
-.PHONY: check-scripts check test all core clean version install install-linux-shortcuts install-dependencies install-engine install-common-mod-files install-default-mods install-core install-linux-icons install-linux-desktop install-linux-mime install-linux-appdata install-man-page install-linux-scripts uninstall help
+.PHONY: check-scripts check test all core clean version install install-linux-shortcuts install-dependencies install-engine install-common-mod-files install-default-mods install-linux-icons install-linux-desktop install-linux-mime install-linux-appdata install-man-page install-linux-scripts uninstall help
diff --git a/packaging/macos/buildpackage.sh b/packaging/macos/buildpackage.sh
index 6ee4e851f6..7fd04b93cd 100755
--- a/packaging/macos/buildpackage.sh
+++ b/packaging/macos/buildpackage.sh
@@ -59,6 +59,11 @@ populate_bundle() {
 
 	cp -r "${BUILTDIR}/OpenRA.app" "${TEMPLATE_DIR}"
 
+	# Add mod files
+	pushd "${SRCDIR}" > /dev/null || exit 1
+	cp -r "mods/${MOD_ID}" mods/modcontent "${TEMPLATE_DIR}/Contents/Resources/mods"
+	popd > /dev/null || exit 1
+
 	# Assemble multi-resolution icon
 	mkdir "${MOD_ID}.iconset"
 	cp "${ARTWORK_DIR}/${MOD_ID}_16x16.png" "${MOD_ID}.iconset/icon_16x16.png"
@@ -78,18 +83,8 @@ populate_bundle() {
 	modify_plist "{MOD_NAME}" "${MOD_NAME}" "${TEMPLATE_DIR}/Contents/Info.plist"
 	modify_plist "{JOIN_SERVER_URL_SCHEME}" "openra-${MOD_ID}-${TAG}" "${TEMPLATE_DIR}/Contents/Info.plist"
 	modify_plist "{DISCORD_URL_SCHEME}" "discord-${DISCORD_APPID}" "${TEMPLATE_DIR}/Contents/Info.plist"
-}
 
-# Deletes from the first argument's mod dirs all the later arguments
-delete_mods() {
-	pushd "${BUILTDIR}/${1}/Contents/Resources/mods" > /dev/null || exit 1
-	shift
-	rm -rf "$@"
-	pushd > /dev/null || exit 1
-}
-
-# Sign binaries with developer certificate
-sign_bundle() {
+	# Sign binaries with developer certificate
 	if [ -n "${MACOS_DEVELOPER_IDENTITY}" ]; then
 		codesign -s "${MACOS_DEVELOPER_IDENTITY}" --timestamp --options runtime -f --entitlements entitlements.plist "${BUILTDIR}/${1}/Contents/Resources/"*.dylib
 		codesign -s "${MACOS_DEVELOPER_IDENTITY}" --timestamp --options runtime -f --entitlements entitlements.plist --deep "${BUILTDIR}/${1}"
@@ -131,21 +126,15 @@ build_platform() {
 	make clean
 	make core TARGETPLATFORM=osx-x64
 	make version VERSION="${TAG}"
-	make install-core gameinstalldir="/Contents/Resources/" DESTDIR="${BUILTDIR}/OpenRA.app"
-	make install-dependencies TARGETPLATFORM=osx-x64 gameinstalldir="/Contents/Resources/"  DESTDIR="${BUILTDIR}/OpenRA.app"
+
+	make install-engine gameinstalldir="/Contents/Resources/" DESTDIR="${BUILTDIR}/OpenRA.app"
+	make install-common-mod-files gameinstalldir="/Contents/Resources/" DESTDIR="${BUILTDIR}/OpenRA.app"
+	make install-dependencies TARGETPLATFORM=osx-x64 gameinstalldir="/Contents/Resources/" DESTDIR="${BUILTDIR}/OpenRA.app"
 	popd > /dev/null || exit 1
 
 	populate_bundle "OpenRA - Red Alert.app" "ra" "Red Alert" "699222659766026240"
-	delete_mods "OpenRA - Red Alert.app" "cnc" "d2k"
-	sign_bundle "OpenRA - Red Alert.app"
-
 	populate_bundle "OpenRA - Tiberian Dawn.app" "cnc" "Tiberian Dawn" "699223250181292033"
-	delete_mods "OpenRA - Tiberian Dawn.app" "ra" "d2k"
-	sign_bundle "OpenRA - Tiberian Dawn.app"
-
 	populate_bundle "OpenRA - Dune 2000.app" "d2k" "Dune 2000" "712711732770111550"
-	delete_mods "OpenRA - Dune 2000.app" "ra" "cnc"
-	sign_bundle "OpenRA - Dune 2000.app"
 
 	rm -rf "${BUILTDIR}/OpenRA.app"
 
diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh
index 683341e304..c9d7cfd4a7 100755
--- a/packaging/windows/buildpackage.sh
+++ b/packaging/windows/buildpackage.sh
@@ -70,7 +70,9 @@ function build_platform()
 	make clean
 	make core "${TARGETPLATFORM}" "${IS_WIN32}"
 	make version VERSION="${TAG}"
-	make install-core "${TARGETPLATFORM}" gameinstalldir="" DESTDIR="${BUILTDIR}"
+	make install-engine "${TARGETPLATFORM}" gameinstalldir="" DESTDIR="${BUILTDIR}"
+	make install-common-mod-files gameinstalldir="" DESTDIR="${BUILTDIR}"
+	make install-default-mods gameinstalldir="" DESTDIR="${BUILTDIR}"
 	make install-dependencies "${TARGETPLATFORM}" gameinstalldir="" DESTDIR="${BUILTDIR}"
 	popd > /dev/null || exit 1