diff --git a/icons/formats/gemf.ico b/icons/formats/gemf.ico
new file mode 100644
index 00000000..60773eb6
Binary files /dev/null and b/icons/formats/gemf.ico differ
diff --git a/icons/formats/scripts/extensions b/icons/formats/scripts/extensions
index d9ef87e0..3a0d106a 100644
--- a/icons/formats/scripts/extensions
+++ b/icons/formats/scripts/extensions
@@ -29,3 +29,4 @@ omd:#ed09cb
 ghp:#ed09cb
 qct:#370642
 trk:#cccccc
+gemf:#147085
diff --git a/pkg/gpxsee.desktop b/pkg/gpxsee.desktop
index 7ca26dc9..aaaf7da0 100644
--- a/pkg/gpxsee.desktop
+++ b/pkg/gpxsee.desktop
@@ -15,4 +15,4 @@ Icon=gpxsee
 Terminal=false
 Type=Application
 Categories=Graphics;Viewer;Education;Geography;Maps;Sports;Qt
-MimeType=application/gpx+xml;application/vnd.garmin.tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.rmaps.sqlite;application/vnd.osmdroid.sqlite;application/vnd.mapsforge.map;application/vnd.tomtom.ov2;application/vnd.tomtom.itn;application/vnd.esri.wld;application/vnd.onmove.omd;application/vnd.onmove.ghp;application/vnd.memory-map.qct;application/vnd.twonav.trk;application/vnd.twonav.rte;application/vnd.twonav.wpt
+MimeType=application/gpx+xml;application/vnd.garmin.tcx+xml;application/vnd.ant.fit;application/vnd.google-earth.kml+xml;application/vnd.fai.igc;application/vnd.nmea.nmea;application/vnd.oziexplorer.plt;application/vnd.oziexplorer.rte;application/vnd.oziexplorer.wpt;application/vnd.groundspeak.loc+xml;application/vnd.sigma.slf+xml;application/geo+json;application/vnd.naviter.seeyou.cup;application/vnd.garmin.gpi;application/vnd.suunto.sml+xml;image/jpeg;text/csv;application/vnd.garmin.img;application/vnd.garmin.jnx;application/vnd.garmin.gmap+xml;image/vnd.maptech.kap;application/vnd.oziexplorer.map;application/vnd.mapbox.mbtiles;application/vnd.twonav.rmap;application/vnd.trekbuddy.tba;application/vnd.gpxsee.map+xml;application/x-tar;image/tiff;application/vnd.google-earth.kmz;application/vnd.alpinequest.aqm;application/vnd.cgtk.gemf;application/vnd.rmaps.sqlite;application/vnd.osmdroid.sqlite;application/vnd.mapsforge.map;application/vnd.tomtom.ov2;application/vnd.tomtom.itn;application/vnd.esri.wld;application/vnd.onmove.omd;application/vnd.onmove.ghp;application/vnd.memory-map.qct;application/vnd.twonav.trk;application/vnd.twonav.rte;application/vnd.twonav.wpt
diff --git a/pkg/gpxsee.xml b/pkg/gpxsee.xml
index e14e274a..0d450698 100644
--- a/pkg/gpxsee.xml
+++ b/pkg/gpxsee.xml
@@ -279,6 +279,13 @@
 		<glob pattern="*.aqm"/>
 	</mime-type>
 
+	<mime-type type="application/vnd.cgtk.gemf">
+		<comment>GEMF Map File</comment>
+		<sub-class-of type="application/octet-stream"/>
+		<generic-icon name="application/octet-stream"/>
+		<glob pattern="*.gemf"/>
+	</mime-type>
+
 	<mime-type type="application/vnd.rmaps.sqlite">
 		<comment>RMaps SQLite Map File</comment>
 		<sub-class-of type="application/vnd.sqlite3"/>
diff --git a/pkg/gpxsee64.nsi b/pkg/gpxsee64.nsi
index 053aa658..7794e036 100644
--- a/pkg/gpxsee64.nsi
+++ b/pkg/gpxsee64.nsi
@@ -180,13 +180,14 @@ Section "GPXSee" SEC_APP
   !insertmacro FILE_ASSOCIATION_ADD "ghp" "ONmove Log File" 23
   !insertmacro FILE_ASSOCIATION_ADD "qct" "QuickChart Map File" 24
   !insertmacro FILE_ASSOCIATION_ADD "trk" "TwoNav Track File" 25
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 26
-  !insertmacro FILE_ASSOCIATION_ADD "kmz" "KML geographic compressed data" 26
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 27
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 28
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 29
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track File" 30
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 31
+  !insertmacro FILE_ASSOCIATION_ADD "gemf" "GEMF Map File" 26
+  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 27
+  !insertmacro FILE_ASSOCIATION_ADD "kmz" "KML geographic compressed data" 27
+  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 28
+  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 29
+  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 30
+  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track File" 31
+  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 32
 
   WriteRegStr HKCR "Applications\GPXSee.exe\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
   WriteRegStr HKCR ".gpx\OpenWithList" "GPXSee.exe" ""
@@ -235,6 +236,7 @@ Section "GPXSee" SEC_APP
   WriteRegStr HKCR ".ghp\OpenWithList" "GPXSee.exe" ""
   WriteRegStr HKCR ".qct\OpenWithList" "GPXSee.exe" ""
   WriteRegStr HKCR ".trk\OpenWithList" "GPXSee.exe" ""
+  WriteRegStr HKCR ".gemf\OpenWithList" "GPXSee.exe" ""
 
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
 
@@ -388,6 +390,7 @@ Section "Uninstall"
   !insertmacro FILE_ASSOCIATION_REMOVE "ghp"
   !insertmacro FILE_ASSOCIATION_REMOVE "qct"
   !insertmacro FILE_ASSOCIATION_REMOVE "trk"
+  !insertmacro FILE_ASSOCIATION_REMOVE "gemf"
 
   DeleteRegValue HKCR ".gpx\OpenWithList" "GPXSee.exe"
   DeleteRegValue HKCR ".tcx\OpenWithList" "GPXSee.exe"
@@ -435,6 +438,7 @@ Section "Uninstall"
   DeleteRegValue HKCR ".ghp\OpenWithList" "GPXSee.exe"
   DeleteRegValue HKCR ".qct\OpenWithList" "GPXSee.exe"
   DeleteRegValue HKCR ".trk\OpenWithList" "GPXSee.exe"
+  DeleteRegValue HKCR ".gemf\OpenWithList" "GPXSee.exe"
   DeleteRegKey HKCR "Applications\GPXSee.exe"   
   
   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'