diff --git a/Makefile b/Makefile
index c1162bae45..3364a9d9a7 100644
--- a/Makefile
+++ b/Makefile
@@ -439,6 +439,7 @@ install-linux-mime:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
 	@$(INSTALL_DATA) packaging/linux/openra-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
 	@$(INSTALL_DATA) packaging/linux/openra-replays.desktop "$(DESTDIR)$(datadir)/applications"
+	@$(INSTALL_DATA) packaging/linux/openra-launch-mod.desktop "$(DESTDIR)$(datadir)/applications"
 
 install-linux-appdata:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/appdata/"
@@ -484,6 +485,9 @@ uninstall:
 	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra"
 	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-server"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-join-servers.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-launch-mod.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-join-servers.desktop"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra.png"
diff --git a/packaging/linux/openra-launch-mod.desktop b/packaging/linux/openra-launch-mod.desktop
new file mode 100644
index 0000000000..a8d610e1bf
--- /dev/null
+++ b/packaging/linux/openra-launch-mod.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=OpenRA
+GenericName=Real Time Strategy Game
+Comment=Reimagining of early Westwood Games
+Icon=openra
+Exec=openra Game.Mod=%f
+Terminal=false
+NoDisplay=true
+Categories=Game;StrategyGame;
+MimeType=application/x-openra-mod;
\ No newline at end of file
diff --git a/packaging/linux/openra-mimeinfo.xml b/packaging/linux/openra-mimeinfo.xml
index 3a0767e0ac..2042cb50f8 100644
--- a/packaging/linux/openra-mimeinfo.xml
+++ b/packaging/linux/openra-mimeinfo.xml
@@ -8,6 +8,13 @@
     <glob weight="60" pattern="*.orarep"/>
   </mime-type>
 
+  <mime-type type="application/x-openra-mod">
+    <icon name="openra" />
+    <generic-icon name="applications-games"/>
+    <comment>OpenRA Mod</comment>
+    <glob weight="60" pattern="*.oramod"/>
+  </mime-type>
+
   <mime-type type="x-scheme-handler/openra">
     <icon name="openra" />
     <generic-icon name="applications-games"/>
diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index 1f0aeb14a1..59eb414ea2 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -60,7 +60,12 @@ Section "-Reg" Reg
 	WriteRegStr HKLM "Software\Classes\.orarep" "" "OpenRA_replay"
 	WriteRegStr HKLM "Software\Classes\OpenRA_replay\DefaultIcon" "" "$INSTDIR\OpenRA.ico,0"
 	WriteRegStr HKLM "Software\Classes\OpenRA_replay\Shell\Open\Command" "" "$INSTDIR\OpenRA.exe Launch.Replay=$\"%1$\""
-	
+
+	; oramod file association
+	WriteRegStr HKLM "Software\Classes\.oramod" "" "OpenRA_mod"
+	WriteRegStr HKLM "Software\Classes\OpenRA_mod\DefaultIcon" "" "$INSTDIR\OpenRA.ico,0"
+	WriteRegStr HKLM "Software\Classes\OpenRA_mod\Shell\Open\Command" "" "$INSTDIR\OpenRA.exe Game.Mod=$\"%1$\""
+
 	; OpenRA URL Scheme
 	WriteRegStr HKLM "Software\Classes\openra" "" "URL:OpenRA scheme"
 	WriteRegStr HKLM "Software\Classes\openra" "URL Protocol" ""