Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java	(revision 11399)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java	(revision 11400)
@@ -63,5 +63,8 @@
 	protected URL getURL(double w, double s,double e,double n,
 			int wi, int ht) throws MalformedURLException {
-		String str = baseURL + "&bbox="
+		String str = baseURL;
+		if(!str.endsWith("?"))
+			str += "&";
+		str += "bbox="
 			+ latLonFormat.format(w) + ","
 			+ latLonFormat.format(s) + ","
Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/YAHOOGrabber.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/YAHOOGrabber.java	(revision 11399)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/YAHOOGrabber.java	(revision 11400)
@@ -6,7 +6,7 @@
 import java.awt.Image;
 import java.net.URL;
+import java.io.IOException;
+import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.io.IOException;
-
 import java.util.StringTokenizer;
 
@@ -32,7 +32,10 @@
 	protected BufferedImage grab(URL url) throws IOException {
 		ArrayList<String> cmdParams = new ArrayList<String>();
-		
-		StringTokenizer st = new StringTokenizer(tr(browserCmd, url.toString()));
-		while( st.hasMoreTokens() ) 
+		String urlstring = url.toExternalForm();
+		// work around a problem in URL removing 2 slashes
+		if(!urlstring.startsWith("file:///"))
+			urlstring = urlstring.replaceFirst("file:", "file://");
+		StringTokenizer st = new StringTokenizer(MessageFormat.format(browserCmd, urlstring));
+		while( st.hasMoreTokens() )
 			cmdParams.add(st.nextToken());