diff --git a/build-scripts/regions/indexes.xml b/build-scripts/regions/indexes.xml
index 1d3bc68bd8..69c2ceb032 100644
--- a/build-scripts/regions/indexes.xml
+++ b/build-scripts/regions/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"/>
@@ -238,7 +238,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=""/>
@@ -307,7 +307,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=""/>
@@ -331,7 +331,7 @@
 		</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"/>
@@ -410,10 +410,10 @@
 	
 				
 		<!--  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="" />
@@ -469,7 +469,7 @@
 		
 		
 		<!-- 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="" />
@@ -489,23 +489,23 @@
 		</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>
 		
 		<!--  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>
 		<!-- 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>