Index: /applications/editors/josm/plugins/osmarender/.project
===================================================================
--- /applications/editors/josm/plugins/osmarender/.project	(revision 29634)
+++ /applications/editors/josm/plugins/osmarender/.project	(revision 29635)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>osmarender</name>
+	<name>JOSM-osmarender</name>
 	<comment></comment>
 	<projects>
Index: /applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java
===================================================================
--- /applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java	(revision 29634)
+++ /applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java	(revision 29635)
@@ -41,4 +41,5 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.PlatformHookWindows;
 
 public class OsmarenderPlugin extends Plugin {
@@ -107,12 +108,12 @@
 
                 // get the exec line
-                String exec = firefox;
-                if (System.getProperty("os.name").startsWith("Windows"))
-                    exec += " file:///"+getPluginDir().replace('\\','/').replace(" ","%20")+File.separator+"generated.xml\"";
+                String argument; 
+                if (Main.platform instanceof PlatformHookWindows)
+                    argument = "file:///"+getPluginDir().replace('\\','/').replace(" ","%20")+File.separator+"generated.xml\"";
                 else
-                    exec += " "+getPluginDir()+File.separator+"generated.xml";
+                    argument = getPluginDir()+File.separator+"generated.xml";
 
                 // launch up the viewer
-                Runtime.getRuntime().exec(exec);
+                Runtime.getRuntime().exec(new String[]{firefox, argument});
             } catch (IOException e1) {
                 JOptionPane.showMessageDialog(Main.parent, tr("Firefox not found. Please set firefox executable in the Map Settings page of the preferences."));