Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 5575)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 5576)
@@ -488,7 +488,7 @@
             FileFilter ff;
             if (s instanceof MapCSSStyleSource) {
-                ff = new ExtensionFileFilter("mapcss,css", "mapcss", tr("Map paint style file (*.mapcss)"));
+                ff = new ExtensionFileFilter("mapcss,css,zip", "mapcss", tr("Map paint style file (*.mapcss, *.zip)"));
             } else {
-                ff = new ExtensionFileFilter("xml", "xml", tr("Map paint style file (*.xml)"));
+                ff = new ExtensionFileFilter("xml,zip", "xml", tr("Map paint style file (*.xml, *.zip)"));
             }
             fcm.createFileChooser(false, null, Arrays.asList(ff, FileFilterAllFiles.getInstance()), ff, JFileChooser.FILES_ONLY)
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 5575)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 5576)
@@ -758,7 +758,7 @@
                 FileFilter ff;
                 if (isMapPaint) {
-                    ff = new ExtensionFileFilter("xml,mapcss,css", "xml", tr("Map paint style file (*.xml, *.mapcss)"));
+                    ff = new ExtensionFileFilter("xml,mapcss,css,zip", "xml", tr("Map paint style file (*.xml, *.mapcss, *.zip)"));
                 } else {
-                    ff = new ExtensionFileFilter("xml", "xml", tr("Preset definition file (*.xml)"));
+                    ff = new ExtensionFileFilter("xml,zip", "xml", tr("Preset definition file (*.xml, *.zip)"));
                 }
                 JFileChooserManager fcm = new JFileChooserManager(true)