diff --git a/build-scripts/regions/1_1_indexes_europe.xml b/build-scripts/regions/1_1_indexes_europe.xml
index 6248af4445..b8086fcb96 100644
--- a/build-scripts/regions/1_1_indexes_europe.xml
+++ b/build-scripts/regions/1_1_indexes_europe.xml
@@ -12,7 +12,7 @@
 		
         <!-- Countries to download from geofabrik or cloudmade server -->
 		<!-- 1. EUROPE [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/{0}.osm.pbf" region_prefix="" skip="false" region_suffix="_Europe">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/europe/{0}.osm.pbf" region_prefix="" skip="false" region_suffix="_Europe">
 			<region name="albania" esize="6" />
 			<region name="andorra" esize="1" />
 			<region name="austria" esize="110" />
@@ -60,7 +60,7 @@
 		</regions>
 
 		<!-- 1.1 GREAT BRITAIN [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/great_britain/{0}.osm.pbf" region_prefix="GB_" skip="false" region_suffix="_Europe">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/europe/great_britain/{0}.osm.pbf" region_prefix="GB_" skip="false" region_suffix="_Europe">
 			<region name="scotland" esize=""/>		
 			<region name="wales" esize="10"/>
 			<region name="england" esize="230"/>
diff --git a/build-scripts/regions/1_2_indexes_france_germany.xml b/build-scripts/regions/1_2_indexes_france_germany.xml
index b9c6f8d12f..0c213f2c98 100644
--- a/build-scripts/regions/1_2_indexes_france_germany.xml
+++ b/build-scripts/regions/1_2_indexes_france_germany.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <regions_list>
 		<!-- 1.2 FRANCE [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/france/{0}.osm.pbf" region_prefix="France_" 
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/europe/france/{0}.osm.pbf" region_prefix="France_" 
 			skip="false" region_suffix="_Europe">
 			<region name="alsace" esize="" />
 			<region name="aquitaine" esize="" />
@@ -28,7 +28,7 @@
 		</regions>
 
 		<!-- 1.3 GERMANY [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/germany/{0}.osm.pbf" region_prefix="Germany_" skip="false" 
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/europe/germany/{0}.osm.pbf" region_prefix="Germany_" skip="false" 
 			region_suffix="_Europe">
 			<region name="baden-wuerttemberg" esize="" cityAdminLevel="7"/>
 			<region name="bayern" esize="" cityAdminLevel="7"/>
diff --git a/build-scripts/regions/2_2_indexes_asia.xml b/build-scripts/regions/2_2_indexes_asia.xml
index 38fc56c87a..f0c2577c23 100644
--- a/build-scripts/regions/2_2_indexes_asia.xml
+++ b/build-scripts/regions/2_2_indexes_asia.xml
@@ -4,30 +4,30 @@
         <!-- 2. ASIA -->
 		
 		<!-- 2.2 ASIA-AVAILABLE ON GEOFABRIK.DE [SOURCE: GEOFABRIK.DE] (REST OF ASIA IS BELOW FROM CLOUDMADE.COM) -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/asia/{0}.osm.pbf" region_prefix="" region_suffix="_Asia" skip="false">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/asia/{0}.osm.pbf" region_prefix="" region_suffix="_Asia" skip="false">
 			<region name="azerbaijan" esize="15"/>
 			<region name="china" esize="4"/>
 			<region name="gaza" esize="3"/>
 			<region name="india" esize="1"/>
 			<region name="indonesia" esize="3"/>
+			<region name="iran" esize="1"/>
 			<region name="iraq" esize="1"/>
 			<region name="israel_and_palestine" esize="1"/>
 			<region name="japan" esize="1"/>
 			<region name="kazakhstan" esize="1"/>
 			<region name="kyrgyzstan" esize="1"/>
+			<region name="malaysia_singapore_brunei" esize=""/>
 			<region name="mongolia" esize="1"/>
 			<region name="pakistan" esize="1"/>
 			<region name="philippines" esize="1"/>
 			<region name="taiwan" esize="1"/>
+			<region name="tajikistan" esize="1"/>
 			<region name="turkmenistan" esize="1"/>
 			<region name="uzbekistan" esize="1"/>
+			<region name="vietnam" esize="1"/>
 		</regions>
 	    
-		<!-- 2.3 CENTRAL ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/central_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="false">
-			<region name="tajikistan" esize="3"/>
-		</regions>
-		
+
 		<!-- 2.3 EASTERN ASIA [SOURCE: CLOUDMADE.COM] -->
 		<regions siteToDownload="http://downloads.cloudmade.com/asia/eastern_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="false">
 			<region name="hong_kong" esize="67"/>
@@ -48,7 +48,6 @@
 			<region name="singapore" esize="2"/>
 			<region name="spratly_islands" esize="1"/>
 			<region name="thailand" esize="12"/>
-			<region name="vietnam" esize=""/>
 		</regions>	
 			
 		<!-- 2.3 SOUTHERN ASIA [SOURCE: CLOUDMADE.COM] -->
diff --git a/build-scripts/regions/3_indexes_northamerica.xml b/build-scripts/regions/3_indexes_northamerica.xml
index 09a346740d..a16e94ed19 100644
--- a/build-scripts/regions/3_indexes_northamerica.xml
+++ b/build-scripts/regions/3_indexes_northamerica.xml
@@ -2,7 +2,7 @@
 <regions_list>
 		<!-- 3. North America  -->		
 		<!-- 3.1 USA-AVAILABLE ON GEOFABRIK.DE [SOURCE: GEOFABRIK.DE] (REST OF USA IS BELOW FROM CLOUDMADE.COM) -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/north-america/us/{0}.osm.pbf" skip="false" region_prefix="US_" region_suffix="_NorthAmerica">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/north-america/us/{0}.osm.pbf" skip="false" region_prefix="US_" region_suffix="_NorthAmerica">
 			<region name="alabama" esize=""/>
 			<region name="alaska" esize=""/>
 			<region name="arizona" esize=""/>
@@ -60,7 +60,7 @@
 
 		
 		<!-- 3.2 CANADA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/north-america/canada/{0}.osm.pbf" region_prefix="Canada_" skip="false" region_suffix="_NorthAmerica">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/north-america/canada/{0}.osm.pbf" region_prefix="Canada_" skip="false" region_suffix="_NorthAmerica">
 			<region name="alberta" esize="36"/>
 			<region name="british-columbia" esize=""/>
 			<region name="manitoba" esize=""/>
diff --git a/build-scripts/regions/4_indexes_centralamerica.xml b/build-scripts/regions/4_indexes_centralamerica.xml
index 2abcaafda4..e8d43a3057 100644
--- a/build-scripts/regions/4_indexes_centralamerica.xml
+++ b/build-scripts/regions/4_indexes_centralamerica.xml
@@ -2,10 +2,10 @@
 <regions_list>
 				
 		<!--  4. CENTRAL AMERICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix=""  skip="true" region_suffix="">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/{0}.osm.pbf" region_prefix=""  skip="true" region_suffix="">
 			<region name="central-america" esize=""/>
 		</regions>	
-		<regions siteToDownload="http://download.geofabrik.de/osm/central-america/{0}.osm.pbf" region_prefix=""  skip="false" region_suffix="_CentralAmerica">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/central-america/{0}.osm.pbf" region_prefix=""  skip="false" region_suffix="_CentralAmerica">
 			<region name="belize" esize="" />
 			<region name="guatemala" esize="" />
 			<region name="haiti-and-domrep" esize="" />
diff --git a/build-scripts/regions/5_indexes_southamerica.xml b/build-scripts/regions/5_indexes_southamerica.xml
index 9b5dafc429..928e4115e2 100644
--- a/build-scripts/regions/5_indexes_southamerica.xml
+++ b/build-scripts/regions/5_indexes_southamerica.xml
@@ -2,29 +2,29 @@
 <regions_list>
 		
 		<!--  5. SOUTH AMERICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" skip="true"
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/{0}.osm.pbf" region_prefix="" skip="true"
 			region_suffix="">
 			<region name="south-america" esize="22"/>
 		</regions>
 		
-		<regions siteToDownload="http://download.geofabrik.de/osm/south-america/{0}.osm.pbf" region_prefix="" skip="false"
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/south-america/{0}.osm.pbf" region_prefix="" skip="false"
 			region_suffix="_SouthAmerica">
 			<region name="argentina" esize="" />
 			<region name="bolivia" esize="" />
 			<region name="brazil" esize="" />
 			<region name="chile" esize="" />
 			<region name="colombia" esize="" />
+			<region name="ecuador" esize="" />
+			<region name="uruguay" esize="" />
 		</regions>
 		
 		<!--  5. SOUTH AMERICA [SOURCE: CLOUDMADE.COM] --> 
 		<regions siteToDownload="http://downloads.cloudmade.com/americas/south_america/{0}/{0}.osm.bz2" region_prefix=""  
 					skip="false" region_suffix="_SouthAmerica">	
-			<region name="ecuador" esize="" />
 			<region name="guyana" esize="" />
 			<region name="paraguay" esize="" />
 			<region name="peru" esize="" />
 			<region name="suriname" esize="" />
-			<region name="uruguay" esize="" />
 			<region name="venezuela" esize="" />
 		</regions>	
 		
diff --git a/build-scripts/regions/6_indexes_africa.xml b/build-scripts/regions/6_indexes_africa.xml
index 1cd73999a8..083d6662f2 100644
--- a/build-scripts/regions/6_indexes_africa.xml
+++ b/build-scripts/regions/6_indexes_africa.xml
@@ -2,19 +2,25 @@
 <regions_list>
 
 		<!-- 6. AFRICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="true">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="true">
 			<region name="africa" esize=""/>
 		</regions>
 		<!-- 6. AFRICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/africa/{0}.osm.pbf" region_prefix="" region_suffix="_Africa"  skip="false">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/africa/{0}.osm.pbf" region_prefix="" region_suffix="_Africa"  skip="false">
+			<region name="burkina_faso" esize="" />
 			<region name="canary_islands" esize="" />
+			<region name="congo_democratic_republic" esize="" />
+			<region name="egypt" esize="" />
 			<region name="ethiopia" esize="" />
+			<region name="guinea-bissau" esize="" />
 			<region name="guinea" esize="" />
 			<region name="ivory_coast" esize="" />
 			<region name="liberia" esize="" />
 			<region name="libya" esize="" />
 			<region name="madagascar" esize="" />
 			<region name="morocco" esize="" />
+			<region name="nigeria" esize="" />
+			<region name="somalia" esize="" />
 			<region name="south_africa_and_lesotho" esize="" />
 			<region name="tanzania" esize="" />
 		</regions>
diff --git a/build-scripts/regions/7_indexes_australia.xml b/build-scripts/regions/7_indexes_australia.xml
index 047a77fc33..507289df83 100644
--- a/build-scripts/regions/7_indexes_australia.xml
+++ b/build-scripts/regions/7_indexes_australia.xml
@@ -3,12 +3,12 @@
 		
 
 		<!-- 7. AUSTRALIA-OCEANIA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="false">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="false">
 			<region name="australia-oceania" esize=""/>
 		</regions>
 				
 		<!-- 7. NEW ZEALAND-AUSTRALIA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/australia-oceania/{0}.osm.pbf" region_prefix="" region_suffix="_Oceania"  skip="false">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/australia-oceania/{0}.osm.pbf" region_prefix="" region_suffix="_Oceania"  skip="false">
 			<region name="new-zealand" esize=""/>
 			<region name="new-caledonia" esize=""/>
 		</regions>			
diff --git a/build-scripts/regions/big_indexes.xml b/build-scripts/regions/big_indexes.xml
index 49a2d2d60f..7f42e91841 100644
--- a/build-scripts/regions/big_indexes.xml
+++ b/build-scripts/regions/big_indexes.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <regions_list>
    <!--
-   <regions siteToDownload="http://download.geofabrik.de/osm/europe/{0}.osm.pbf" skip="false" region_suffix="_europe">
+   <regions siteToDownload="http://download.geofabrik.de/openstreetmap/europe/{0}.osm.pbf" skip="false" region_suffix="_europe">
 	    <region name="germany" esize="820"/>
    </regions> -->
    <regions siteToDownload="http://downloads.cloudmade.com/asia/northern_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia"  skip="false">
    		<region name="russia" esize="820"/> 
    </regions>
 
-	<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" skip="false"	region_suffix="">
+	<regions siteToDownload="http://download.geofabrik.de/openstreetmap/{0}.osm.pbf" region_prefix="" skip="false"	region_suffix="">
 		 <region name="south-america" esize="22"/>
 	</regions>
-    <regions siteToDownload="http://download.geofabrik.de/osm/europe/{0}.osm.pbf" skip="false" region_suffix="_europe">
+    <regions siteToDownload="http://download.geofabrik.de/openstreetmap/europe/{0}.osm.pbf" skip="false" region_suffix="_europe">
 	     <region name="france" esize="1820"/> 			 			
     </regions>
 							
diff --git a/build-scripts/regions/full_indexes.xml b/build-scripts/regions/full_indexes.xml
index 7a82e9596e..04e1c9c699 100644
--- a/build-scripts/regions/full_indexes.xml
+++ b/build-scripts/regions/full_indexes.xml
@@ -12,7 +12,7 @@
 		
         <!-- Countries to download from geofabrik or cloudmade server -->
 		<!-- 1. EUROPE [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/{0}.osm.pbf" region_prefix="" skip="false" region_suffix="_Europe">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/europe/{0}.osm.pbf" region_prefix="" skip="false" region_suffix="_Europe">
 			<region name="albania" esize="6" />
 			<region name="andorra" esize="1" />
 			<region name="austria" esize="110" />
@@ -59,14 +59,14 @@
 		</regions>
 
 		<!-- 1.1 GREAT BRITAIN [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/great_britain/{0}.osm.pbf" region_prefix="GB_" skip="false" region_suffix="_Europe">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/europe/great_britain/{0}.osm.pbf" region_prefix="GB_" skip="false" region_suffix="_Europe">
 			<region name="scotland" esize=""/>		
 			<region name="wales" esize="10"/>
 			<region name="england" esize="230"/>
 		</regions>
 
 		<!-- 1.2 FRANCE [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/france/{0}.osm.pbf" region_prefix="France_" 
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/europe/france/{0}.osm.pbf" region_prefix="France_" 
 			skip="false" region_suffix="_Europe">
 			<region name="alsace" esize="" />
 			<region name="aquitaine" esize="" />
@@ -93,7 +93,7 @@
 		</regions>
 
 		<!-- 1.3 GERMANY [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/germany/{0}.osm.pbf" region_prefix="Germany_" skip="false" 
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/europe/germany/{0}.osm.pbf" region_prefix="Germany_" skip="false" 
 			region_suffix="_Europe">
 			<region name="baden-wuerttemberg" esize="" cityAdminLevel="7"/>
 			<region name="bayern" esize="" cityAdminLevel="7"/>
@@ -234,28 +234,27 @@
 	        </regions>
 		
 		<!-- 2.2 ASIA-AVAILABLE ON GEOFABRIK.DE [SOURCE: GEOFABRIK.DE] (REST OF ASIA IS BELOW FROM CLOUDMADE.COM) -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/asia/{0}.osm.pbf" region_prefix="" region_suffix="_Asia" skip="false">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/asia/{0}.osm.pbf" region_prefix="" region_suffix="_Asia" skip="false">
 			<region name="azerbaijan" esize="15"/>
 			<region name="china" esize="4"/>
 			<region name="gaza" esize="3"/>
 			<region name="india" esize="1"/>
 			<region name="indonesia" esize="3"/>
+			<region name="iran" esize="1"/>
 			<region name="iraq" esize="1"/>
 			<region name="israel_and_palestine" esize="1"/>
 			<region name="japan" esize="1"/>
 			<region name="kazakhstan" esize="1"/>
 			<region name="kyrgyzstan" esize="1"/>
+			<region name="malaysia_singapore_brunei" esize=""/>
 			<region name="mongolia" esize="1"/>
 			<region name="pakistan" esize="1"/>
 			<region name="philippines" esize="1"/>
 			<region name="taiwan" esize="1"/>
+			<region name="tajikistan" esize="3"/>
 			<region name="turkmenistan" esize="1"/>
 			<region name="uzbekistan" esize="1"/>
-		</regions>
-	    
-		<!-- 2.3 CENTRAL ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/central_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="false">
-			<region name="tajikistan" esize="3"/>
+			<region name="vietnam" esize=""/>
 		</regions>
 		
 		<!-- 2.3 EASTERN ASIA [SOURCE: CLOUDMADE.COM] -->
@@ -278,7 +277,6 @@
 			<region name="singapore" esize="2"/>
 			<region name="spratly_islands" esize="1"/>
 			<region name="thailand" esize="12"/>
-			<region name="vietnam" esize=""/>
 		</regions>	
 			
 		<!-- 2.3 SOUTHERN ASIA [SOURCE: CLOUDMADE.COM] -->
@@ -315,7 +313,7 @@
 		
 		<!-- 3. North America  -->		
 		<!-- 3.1 USA-AVAILABLE ON GEOFABRIK.DE [SOURCE: GEOFABRIK.DE] (REST OF USA IS BELOW FROM CLOUDMADE.COM) -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/north-america/us/{0}.osm.pbf" skip="false" region_prefix="US_" region_suffix="_NorthAmerica">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/north-america/us/{0}.osm.pbf" skip="false" region_prefix="US_" region_suffix="_NorthAmerica">
 			<region name="alabama" esize=""/>
 			<region name="alaska" esize=""/>
 			<region name="arizona" esize=""/>
@@ -384,7 +382,7 @@
 		</regions> -->
 		
 		<!-- 3.2 CANADA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/north-america/canada/{0}.osm.pbf" region_prefix="Canada_" skip="false" region_suffix="_NorthAmerica">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/north-america/canada/{0}.osm.pbf" region_prefix="Canada_" skip="false" region_suffix="_NorthAmerica">
 			<region name="alberta" esize="36"/>
 			<region name="british-columbia" esize=""/>
 			<region name="manitoba" esize=""/>
@@ -408,10 +406,10 @@
 		</regions>	
 				
 		<!--  4. CENTRAL AMERICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix=""  skip="true" region_suffix="">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/{0}.osm.pbf" region_prefix=""  skip="true" region_suffix="">
 			<region name="central-america" esize=""/>
 		</regions>	
-		<regions siteToDownload="http://download.geofabrik.de/osm/central-america/{0}.osm.pbf" region_prefix=""  skip="false" region_suffix="_CentralAmerica">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/central-america/{0}.osm.pbf" region_prefix=""  skip="false" region_suffix="_CentralAmerica">
 			<region name="belize" esize="" />
 			<region name="guatemala" esize="" />
 			<region name="haiti-and-domrep" esize="" />
@@ -444,58 +442,64 @@
 		</regions>
 				
 		<!--  5. SOUTH AMERICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" skip="true"
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/{0}.osm.pbf" region_prefix="" skip="true"
 			region_suffix="">
 			<region name="south-america" esize="22"/>
 		</regions>
 		
-		<regions siteToDownload="http://download.geofabrik.de/osm/south-america/{0}.osm.pbf" region_prefix="" skip="false"
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/south-america/{0}.osm.pbf" region_prefix="" skip="false"
 			region_suffix="_SouthAmerica">
 			<region name="argentina" esize="" />
 			<region name="bolivia" esize="" />
 			<region name="brazil" esize="" />
 			<region name="chile" esize="" />
 			<region name="colombia" esize="" />
+			<region name="ecuador" esize="" />
+			<region name="uruguay" esize="" />
 		</regions>
 		
 		<!--  5. SOUTH AMERICA [SOURCE: CLOUDMADE.COM] --> 
 		<regions siteToDownload="http://downloads.cloudmade.com/americas/south_america/{0}/{0}.osm.bz2" region_prefix=""  
 					skip="false" region_suffix="_SouthAmerica">	
-			<region name="ecuador" esize="" />
 			<region name="guyana" esize="" />
 			<region name="paraguay" esize="" />
 			<region name="peru" esize="" />
 			<region name="suriname" esize="" />
-			<region name="uruguay" esize="" />
 			<region name="venezuela" esize="" />
-		</regions>	
+		</regions>		
 		
 		
 		<!-- 6. AFRICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="false">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="false">
 			<region name="africa" esize=""/>
 		</regions>
 		<!-- 6. AFRICA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/africa/{0}.osm.pbf" region_prefix="" region_suffix="_Africa"  skip="false">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/africa/{0}.osm.pbf" region_prefix="" region_suffix="_Africa"  skip="false">
+			<region name="burkina_faso" esize="" />
 			<region name="canary_islands" esize="" />
+			<region name="congo_democratic_republic" esize="" />
+			<region name="egypt" esize="" />
 			<region name="ethiopia" esize="" />
+			<region name="guinea-bissau" esize="" />
 			<region name="guinea" esize="" />
 			<region name="ivory_coast" esize="" />
 			<region name="liberia" esize="" />
 			<region name="libya" esize="" />
 			<region name="madagascar" esize="" />
 			<region name="morocco" esize="" />
+			<region name="nigeria" esize="" />
+			<region name="somalia" esize="" />
 			<region name="south_africa_and_lesotho" esize="" />
-			<region name="tanzania" esize="" />
+			<region name="tanzania" esize="" /<name />
 		</regions>
 			
 		<!-- 7. AUSTRALIA-OCEANIA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="false">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/{0}.osm.pbf" region_prefix="" region_suffix=""  skip="false">
 			<region name="australia-oceania" esize=""/>
 		</regions>
 				
 		<!-- 7. NEW ZEALAND-AUSTRALIA [SOURCE: GEOFABRIK.DE] -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/australia-oceania/{0}.osm.pbf" region_prefix="" region_suffix="_Australia"  skip="false">
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/australia-oceania/{0}.osm.pbf" region_prefix="" region_suffix="_Australia"  skip="false">
 			<region name="new-zealand" esize=""/>
 			<region name="new-caledonia" esize=""/>
 		</regions>
diff --git a/build-scripts/regions/indexes.xml b/build-scripts/regions/indexes.xml
index bee058c0a2..1d3bc68bd8 100644
--- a/build-scripts/regions/indexes.xml
+++ b/build-scripts/regions/indexes.xml
@@ -337,22 +337,21 @@
 			<region name="gaza" esize="3"/>
 			<region name="india" esize="1"/>
 			<region name="indonesia" esize="3"/>
+			<region name="iran" esize="1"/>
 			<region name="iraq" esize="1"/>
 			<region name="israel_and_palestine" esize="1"/>
 			<region name="japan" esize="1"/>
 			<region name="kazakhstan" esize="1"/>
 			<region name="kyrgyzstan" esize="1"/>
+			<region name="malaysia_singapore_brunei" esize=""/>
 			<region name="mongolia" esize="1"/>
 			<region name="pakistan" esize="1"/>
 			<region name="philippines" esize="1"/>
 			<region name="taiwan" esize="1"/>
+			<region name="tajikistan" esize="3"/>
 			<region name="turkmenistan" esize="1"/>
 			<region name="uzbekistan" esize="1"/>
-		</regions>
-	    
-		<!-- 2.3 CENTRAL ASIA [SOURCE: CLOUDMADE.COM] -->
-		<regions siteToDownload="http://downloads.cloudmade.com/asia/central_asia/{0}/{0}.osm.bz2" region_prefix="" region_suffix="_Asia" skip="false">
-			<region name="tajikistan" esize="3"/>
+			<region name="vietnam" esize=""/>
 		</regions>
 		
 		<!-- 2.3 EASTERN ASIA [SOURCE: CLOUDMADE.COM] -->
@@ -447,42 +446,44 @@
 		</regions>
 				
 		
-		<regions siteToDownload="http://download.geofabrik.de/osm/south-america/{0}.osm.pbf" region_prefix="" skip="false"
+		<regions siteToDownload="http://download.geofabrik.de/openstreetmap/south-america/{0}.osm.pbf" region_prefix="" skip="false"
 			region_suffix="_SouthAmerica">
 			<region name="argentina" esize="" />
 			<region name="bolivia" esize="" />
 			<region name="brazil" esize="" />
 			<region name="chile" esize="" />
 			<region name="colombia" esize="" />
+			<region name="ecuador" esize="" />
+			<region name="uruguay" esize="" />
 		</regions>
 		
 		<!--  5. SOUTH AMERICA [SOURCE: CLOUDMADE.COM] --> 
 		<regions siteToDownload="http://downloads.cloudmade.com/americas/south_america/{0}/{0}.osm.bz2" region_prefix=""  
 					skip="false" region_suffix="_SouthAmerica">	
-			<region name="ecuador" esize="" />
 			<region name="guyana" esize="" />
 			<region name="paraguay" esize="" />
 			<region name="peru" esize="" />
 			<region name="suriname" esize="" />
-			<region name="uruguay" esize="" />
 			<region name="venezuela" esize="" />
 		</regions>	
 		
 		
 		<!-- 6. AFRICA [SOURCE: GEOFABRIK.DE] -->
 		<regions siteToDownload="http://download.geofabrik.de/osm/africa/{0}.osm.pbf" region_prefix="" region_suffix="_Africa"  skip="false">
+			<region name="burkina_faso" esize="" />
 			<region name="canary_islands" esize="" />
+			<region name="congo_democratic_republic" esize="" />
+			<region name="egypt" esize="" />
 			<region name="ethiopia" esize="" />
+			<region name="guinea-bissau" esize="" />
 			<region name="guinea" esize="" />
 			<region name="ivory_coast" esize="" />
 			<region name="liberia" esize="" />
 			<region name="libya" esize="" />
-			<region name="egypt" esize="" />
-			<region name="somalia" esize="" />
-			<region name="burkina_faso" esize="" />
-			<region name="congo_democratic_republic" esize="" />
 			<region name="madagascar" esize="" />
 			<region name="morocco" esize="" />
+			<region name="nigeria" esize="" />
+			<region name="somalia" esize="" />
 			<region name="south_africa_and_lesotho" esize="" />
 			<region name="tanzania" esize="" />
 		</regions>