diff --git a/maps/README b/maps/README
new file mode 100644
index 0000000000..1b52e5a773
--- /dev/null
+++ b/maps/README
@@ -0,0 +1 @@
+Maps that are not specific to a single mod go here. In most cases, you want to put maps in mods/$MOD/maps/ instead.
\ No newline at end of file
diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index 25ababdd40..d6e7481604 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -60,8 +60,7 @@ Section "Client" Client
 	File "..\..\INSTALL"
 	File "..\..\settings-netplay-cnc.ini"
 	File "..\..\settings-netplay-ra.ini"
-	File "..\..\FreeSans.ttf"
-	File "..\..\FreeSansBold.ttf"
+	File "..\..\*.ttf"
 	
 	File "..\..\OpenRA.Game\OpenRA.ico"
 	
@@ -78,6 +77,8 @@ Section "Client" Client
 	
 	SetOutPath "$INSTDIR\shaders"
 	File "..\..\shaders\*.fx"
+	SetOutPath "$INSTDIR\maps"
+	File "..\..\maps\README"
 SectionEnd
 
 SectionGroup /e "Mods"