diff --git a/Makefile b/Makefile
index 1717c2e704..a1dcf74860 100644
--- a/Makefile
+++ b/Makefile
@@ -324,7 +324,6 @@ install-core: default
 
 	@$(CP_R) glsl "$(DATA_INSTALL_DIR)"
 	@$(CP_R) lua "$(DATA_INSTALL_DIR)"
-	@$(CP) *.ttf "$(DATA_INSTALL_DIR)"
 	@$(CP) SDL2-CS* "$(DATA_INSTALL_DIR)"
 	@$(CP) Eluant* "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)"
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index 7f05f07f05..bb4653acb7 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -171,28 +171,28 @@ ChromeMetrics:
 
 Fonts:
 	Small:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:12
 	Regular:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:14
 	Bold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:14
 	Title:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:32
 	MediumBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:18
 	BigBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:24
 	Tiny:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:10
 	TinyBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:10
 
 LuaScripts:
diff --git a/FreeSans.ttf b/mods/common/FreeSans.ttf
similarity index 100%
rename from FreeSans.ttf
rename to mods/common/FreeSans.ttf
diff --git a/FreeSansBold.ttf b/mods/common/FreeSansBold.ttf
similarity index 100%
rename from FreeSansBold.ttf
rename to mods/common/FreeSansBold.ttf
diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml
index 64fe2a567e..1d35613ab1 100644
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -152,28 +152,28 @@ ChromeMetrics:
 
 Fonts:
 	Regular:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:14
 	Bold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:14
 	Title:
 		Font:./mods/d2k/Dune2k.ttf
 		Size:32
 	MediumBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:18
 	BigBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:24
 	Small:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:12
 	Tiny:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:10
 	TinyBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:10
 
 LuaScripts:
diff --git a/mods/modchooser/mod.yaml b/mods/modchooser/mod.yaml
index 0d2981b346..4be6107424 100644
--- a/mods/modchooser/mod.yaml
+++ b/mods/modchooser/mod.yaml
@@ -31,22 +31,22 @@ ChromeMetrics:
 
 Fonts:
 	Regular:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:14
 	Bold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:14
 	BigBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:24
 	MediumBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:18
 	Tiny:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:10
 	TinyBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:10
 
 LobbyDefaults:
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index 640a46fe29..6d631ef7ba 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -168,28 +168,28 @@ ChromeMetrics:
 
 Fonts:
 	Regular:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:14
 	Bold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:14
 	Title:
 		Font:./mods/ra/ZoodRangmah.ttf
 		Size:48
 	MediumBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:18
 	BigBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:24
 	Small:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:12
 	Tiny:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:10
 	TinyBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:10
 
 LuaScripts:
diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index 8180d55692..c281d83c3e 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -196,25 +196,25 @@ ChromeMetrics:
 
 Fonts:
 	Regular:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:14
 	Bold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:14
 	Title:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:32
 	BigBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:24
 	Small:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:12
 	Tiny:
-		Font:./FreeSans.ttf
+		Font:./mods/common/FreeSans.ttf
 		Size:10
 	TinyBold:
-		Font:./FreeSansBold.ttf
+		Font:./mods/common/FreeSansBold.ttf
 		Size:10
 
 LuaScripts:
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index 4bf50a5194..3944fc59e4 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -32,10 +32,8 @@ markdown Lua-API.md > Lua-API.html
 # List of files that are packaged on all platforms
 FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' 'OpenRA.CrashDialog.exe' \
 'OpenRA.Renderer.Sdl2.dll' 'OpenRA.Renderer.Null.dll' \
-'FreeSans.ttf' 'FreeSansBold.ttf' 'lua' \
-'glsl' 'mods/common' 'mods/ra' 'mods/cnc' 'mods/d2k' 'mods/modchooser' \
-'AUTHORS' 'COPYING' \
-'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' 'CHANGELOG.html' \
+ 'lua' 'glsl' 'mods/common' 'mods/ra' 'mods/cnc' 'mods/d2k' 'mods/modchooser' \
+'AUTHORS' 'COPYING' 'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' 'CHANGELOG.html' \
 'global mix database.dat' 'GeoLite2-Country.mmdb')
 
 echo "Copying files..."
diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index f4f59bc98b..9b5dfebb9f 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -79,7 +79,6 @@ Section "Game" GAME
 	File "${SRCDIR}\CHANGELOG.html"
 	File "${SRCDIR}\CONTRIBUTING.html"
 	File "${SRCDIR}\DOCUMENTATION.html"
-	File "${SRCDIR}\*.ttf"
 	File "${SRCDIR}\OpenRA.ico"
 	File "${SRCDIR}\SharpFont.dll"
 	File "${SRCDIR}\SDL2-CS.dll"
@@ -200,7 +199,6 @@ Function ${UN}Clean
 	Delete $INSTDIR\CONTRIBUTING.html
 	Delete $INSTDIR\DOCUMENTATION.html
 	Delete $INSTDIR\OpenRA.ico
-	Delete $INSTDIR\*.ttf
 	Delete "$INSTDIR\global mix database.dat"
 	Delete $INSTDIR\MaxMind.Db.dll
 	Delete $INSTDIR\MaxMind.GeoIP2.dll