diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 23d926e6..dff4237d 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1697,6 +1697,12 @@ def new_workout_from_file(r, f2,
     # Send an email to info@rowsandall.com with the file attached
     # for me to check if it is a bug, or a new file type
     # worth supporting
+    if fileformat == 'gpx':
+        print('aap')
+        os.remove(f2)
+        message = "GPX files support is on our roadmap. Check back soon."
+        return (0, message, f2)
+
     if fileformat == 'unknown':
         message = "We couldn't recognize the file type"
         extension = os.path.splitext(f2)[1]
diff --git a/rowers/rows.py b/rowers/rows.py
index 9a70073f..c6ebf083 100644
--- a/rowers/rows.py
+++ b/rowers/rows.py
@@ -66,7 +66,7 @@ def validate_image_extension(value):
 def validate_file_extension(value):
   import os
   ext = os.path.splitext(value.name)[1]
-  valid_extensions = ['.tcx','.csv','.TCX',
+  valid_extensions = ['.tcx','.csv','.TCX','.gpx','.GPX',
                       '.CSV','.fit','.FIT','.zip','.ZIP',
                       '.gz','.GZ','.xls']
   if not ext in valid_extensions: