Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/BingAerialTileSource.java
===================================================================
--- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/BingAerialTileSource.java	(revision 25171)
+++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/BingAerialTileSource.java	(revision 25172)
@@ -5,4 +5,5 @@
 import java.io.InputStream;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.List;
@@ -13,4 +14,5 @@
 import javax.imageio.ImageIO;
 
+import org.openstreetmap.josm.Main;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
@@ -104,5 +106,8 @@
         try {
             URL u = new URL("http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial/0,0?zl=1&mapVersion=v1&key="+API_KEY+"&include=ImageryProviders&output=xml");
-            InputStream stream = u.openStream();
+            URLConnection conn = u.openConnection();
+            conn.setConnectTimeout(Main.pref.getInteger("imagery.bing.load-attribution-text.timeout", 4000));
+            InputStream stream = conn.getInputStream();
+            
             XMLReader parser = XMLReaderFactory.createXMLReader();
             AttrHandler handler = new AttrHandler();