Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/DatabaseParser.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/DatabaseParser.java	(revision 19963)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/DatabaseParser.java	(revision 19964)
@@ -96,6 +96,10 @@
             URL url = new URL(getDatabaseUrl());
             HttpURLConnection con = (HttpURLConnection)url.openConnection();
+
+            //Set timeout for 10 seconds.
+            con.setReadTimeout(10000);
             con.connect();
 
+            System.err.println("CzechAddress: Stahuji: " + url.toString());
             System.err.println("CzechAddress: Server vrátil: " + con.getResponseMessage());
 
Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java
===================================================================
--- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java	(revision 19963)
+++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/parser/MvcrParser.java	(revision 19964)
@@ -208,14 +208,30 @@
 //==============================================================================
 
-    static final String URL_DEFAULT = "http://web.mvcr.cz/adresa/adresy.zip";
+    static final String URL_DEFAULT = "http://aplikace.mvcr.cz/adresa/adresy.zip";
     static final String URL_PREFERENCES_KEY = "czechaddress.databaseurl";
-    
+
+    static final String[] OLD_URLS = {
+        "http://web.mvcr.cz/adresa/adresy.zip" // Remove around 10.02.2011
+    };
+
     @Override
     protected String getDatabaseUrl() {
 
-        if (!Main.pref.hasKey(URL_PREFERENCES_KEY))
-            Main.pref.put(URL_PREFERENCES_KEY, URL_DEFAULT);
-
-        return Main.pref.get(URL_PREFERENCES_KEY);
+        // No longer add the default URL into preferences.
+        //if (!Main.pref.hasKey(URL_PREFERENCES_KEY))
+        //    Main.pref.put(URL_PREFERENCES_KEY, URL_DEFAULT);
+
+        /* If an outdated URL is found in the preferences, replace it by the
+         * new one. However the urls from the list should be removed after
+         * a reasonable amount of time (one year?), because this is a
+         * non-systematic solution.
+         */
+        for (String oldUrl : OLD_URLS)
+            if (Main.pref.get(URL_PREFERENCES_KEY, URL_DEFAULT).equals(oldUrl)) {
+                Main.pref.put(URL_PREFERENCES_KEY, URL_DEFAULT);
+                break;
+            }
+
+        return Main.pref.get(URL_PREFERENCES_KEY, URL_DEFAULT);
     }