diff --git a/data/custom.xml b/data/custom.xml
index 42b5134..65740ad 100644
--- a/data/custom.xml
+++ b/data/custom.xml
@@ -74,6 +74,15 @@
     </magic>
   </mime-type>
 
+  <mime-type type="application/gpx+xml">
+    <_comment>GPS Exchange Format (GPX)</_comment>
+    <sub-class-of type="application/xml" />
+    <glob pattern="*.gpx" />
+    <magic priority="50">
+      <match value="&lt;gpx" type="string" offset="0:4096" />
+    </magic>
+  </mime-type>
+
   <mime-type type="video/webm">
     <sub-class-of type="application/x-matroska" />
 
diff --git a/lib/marcel/tables.rb b/lib/marcel/tables.rb
index 52e0290..226364a 100644
--- a/lib/marcel/tables.rb
+++ b/lib/marcel/tables.rb
@@ -384,6 +384,7 @@ module Marcel
     'gnumeric' => 'application/x-gnumeric',
     'go' => 'text/x-go',
     'gph' => 'application/vnd.flographit',
+    'gpx' => 'application/gpx+xml',
     'gqf' => 'application/vnd.grafeq',
     'gqs' => 'application/vnd.grafeq',
     'gram' => 'application/srgs',
@@ -1280,6 +1281,7 @@ module Marcel
     'application/epub+zip' => %w(epub), # Electronic Publication
     'application/fits' => %w(fits fit fts), # Flexible Image Transport System
     'application/font-tdpfr' => %w(pfr),
+    'application/gpx+xml' => %w(gpx), # GPS Exchange Format (GPX)
     'application/gzip' => %w(gz tgz), # Gzip Compressed Archive
     'application/hyperstudio' => %w(stk),
     'application/illustrator' => %w(ai), # Adobe Illustrator Artwork
@@ -2155,6 +2157,7 @@ module Marcel
     'application/dita+xml;format=map' => %w(application/dita+xml),
     'application/dita+xml;format=topic' => %w(application/dita+xml),
     'application/dita+xml;format=val' => %w(application/dita+xml),
+    'application/gpx+xml' => %w(application/xml),
     'application/illustrator' => %w(application/postscript),
     'application/java-archive' => %w(application/zip),
     'application/javascript' => %w(text/plain),
@@ -2497,6 +2500,7 @@ module Marcel
     ['application/dicom', [[128, b['DICM']]]],
     ['application/epub+zip', [[0, b["PK\003\004"], [[30, b['mimetypeapplication/epub+zip']]]]]],
     ['application/fits', [[0, b['SIMPLE  =                    T']], [0, b['SIMPLE  =                T']]]],
+    ['application/gpx+xml', [[0..4096, b['<gpx']]]],
     ['application/javascript', [[0, b['/* jQuery ']], [0, b['/*! jQuery ']], [0, b['/*!'], [[4..8, b['* jQuery ']]]], [0, b['(function(e,undefined){']], [0, b['!function(window,undefined){']], [0, b['/*  Prototype JavaScript ']], [0, b['var Prototype={']], [0, b['function $w(t){']], [0, b['/** @license React']], [0, b['/**'], [[4..8, b['* React ']]]]]],
     ['application/mac-binhex40', [[11, b['must be converted with BinHex']]]],
     ['application/mathematica', [[0, b['(**']], [0, b['(* ']]]],
diff --git a/test/fixtures/name/application/gpx+xml/gpx.gpx b/test/fixtures/name/application/gpx+xml/gpx.gpx
new file mode 100644
index 0000000..17b59e0
--- /dev/null
+++ b/test/fixtures/name/application/gpx+xml/gpx.gpx
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="Wikipedia"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
+  <!-- Comments look like this -->
+  <!-- Source: https://en.wikipedia.org/wiki/GPS_Exchange_Format -->
+  <metadata>
+    <name>Data name</name>
+    <desc>Valid GPX example without special characters</desc>
+    <author>
+      <name>Author name</name>
+    </author>
+  </metadata>
+  <wpt lat="52.518611" lon="13.376111">
+    <ele>35.0</ele>
+    <time>2011-12-31T23:59:59Z</time>
+    <name>Reichstag (Berlin)</name>
+    <sym>City</sym>
+  </wpt>
+  <wpt lat="48.208031" lon="16.358128">
+    <ele>179</ele>
+    <time>2011-12-31T23:59:59Z</time>
+    <name>Parlament (Wien)</name>
+    <sym>City</sym>
+  </wpt>
+  <wpt lat="46.9466" lon="7.44412">
+    <time>2011-12-31T23:59:59Z</time>
+    <name>Bundeshaus (Bern)</name>
+    <sym>City</sym>
+  < /wpt>
+</gpx>