Index: /trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java	(revision 9460)
+++ /trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java	(revision 9461)
@@ -83,5 +83,5 @@
                     layer.getClass().getName()));
 
-        File file = createAndOpenSaveFileChooser(tr("Export GPX file"), GpxImporter.FILE_FILTER);
+        File file = createAndOpenSaveFileChooser(tr("Export GPX file"), GpxImporter.getFileFilter());
         if (file == null)
             return;
Index: /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 9460)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 9461)
@@ -363,5 +363,5 @@
     @Override
     public File createAndOpenSaveFileChooser() {
-        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save GPX file"), GpxImporter.FILE_FILTER);
+        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save GPX file"), GpxImporter.getFileFilter());
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 9460)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 9461)
@@ -965,5 +965,6 @@
     @Override
     public File createAndOpenSaveFileChooser() {
-        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save OSM file"), "osm");
+        String extension = Main.pref.get("save.extension.osm", "osm");
+        return SaveActionBase.createAndOpenSaveFileChooser(tr("Save OSM file"), extension);
     }
 
Index: /trunk/src/org/openstreetmap/josm/io/GpxExporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GpxExporter.java	(revision 9460)
+++ /trunk/src/org/openstreetmap/josm/io/GpxExporter.java	(revision 9461)
@@ -63,5 +63,5 @@
      */
     public GpxExporter() {
-        super(GpxImporter.FILE_FILTER);
+        super(GpxImporter.getFileFilter());
     }
 
Index: /trunk/src/org/openstreetmap/josm/io/GpxImporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GpxImporter.java	(revision 9460)
+++ /trunk/src/org/openstreetmap/josm/io/GpxImporter.java	(revision 9461)
@@ -24,10 +24,4 @@
  */
 public class GpxImporter extends FileImporter {
-
-    /**
-     * The GPX file filter (*.gpx and *.gpx.gz files).
-     */
-    public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
-            "gpx", "gpx", tr("GPX Files"), true);
 
     /**
@@ -71,5 +65,13 @@
      */
     public GpxImporter() {
-        super(FILE_FILTER);
+        super(getFileFilter());
+    }
+
+    /**
+     * Returns a GPX file filter (*.gpx and *.gpx.gz files).
+     */
+    public static ExtensionFileFilter getFileFilter() {
+        return ExtensionFileFilter.newFilterWithArchiveExtensions(
+            "gpx", Main.pref.get("save.extension.gpx", "gpx"), tr("GPX Files"), true);
     }