diff --git a/Docs/WebFrontend/Route.js b/Docs/WebFrontend/Route.js
index 5f7781b58..8072999c8 100644
--- a/Docs/WebFrontend/Route.js
+++ b/Docs/WebFrontend/Route.js
@@ -121,10 +121,12 @@ function showResultsRoute(response) {
 		var from = new OpenLayers.LonLat(startFeat.geometry.x,startFeat.geometry.y).transform(EPSG_900913,EPSG_4326);
 		var to = new OpenLayers.LonLat(endFeat.geometry.x,endFeat.geometry.y).transform(EPSG_900913,EPSG_4326);
 		var routelink = '<div id="routelink"><input name="routelink" type="submit" title="Get Link" onClick="createShortLink(\''+HOST_WEBSITE+'?fr='+from.lat.toFixed(6)+','+from.lon.toFixed(6)+'&to='+to.lat.toFixed(6)+','+to.lon.toFixed(6)+'\');" value="Get Link"></div>';
-		    	
+		//Link for the GPX Download
+		var gpxLink = '(<a href="'+HOST_ROUTING_URL+'&'+from.lat.toFixed(6)+'&'+from.lon.toFixed(6)+'&'+to.lat.toFixed(6)+'&'+to.lon.toFixed(6)+'&z='+this.map.getZoom()+'&output=gpx">Get GPX File</a>)';
+		
         //Show Route Summary
         var output = '<p class="routeSummaryHL">Some information about your Way <br> from \'<span class="routeSummaryHLlight">'+response.route_summary.start_point+'</span>\' to \'<span class="routeSummaryHLlight">'+response.route_summary.end_point+'</span>\'</p>';
-        output += '<p class="routeSummary">Distance: <span class="routeSummarybold">'+response.route_summary.total_distance/1000+' km</span> - Duration: <span class="routeSummarybold">'+secondsToTime(response.route_summary.total_time)+'</span></p><p>'+routelink+'</p><pclass="routeInstructionsHL"> The Route-Instructions:</p>';
+        output += '<p class="routeSummary">Distance: <span class="routeSummarybold">'+response.route_summary.total_distance/1000+' km</span> - Duration: <span class="routeSummarybold">'+secondsToTime(response.route_summary.total_time)+'</span></p><p>'+routelink+'</p><p><span class="routeInstructionsHL">The Route-Instructions:</span> '+gpxLink+'</p>';
         //Show Route Instructions
         output += '<table>';
         var lengthOfArray = response.route_instructions.length;
diff --git a/Docs/WebFrontend/index.html b/Docs/WebFrontend/index.html
index 771eddb99..829f7a10d 100644
--- a/Docs/WebFrontend/index.html
+++ b/Docs/WebFrontend/index.html
@@ -32,7 +32,7 @@
 		<table width="100%"> 
               <tr id="StartPoint">
                 <td><div class="textLabel"><img src="img/arrow-start.png" class="radioIcons" width="12" height="16" alt=""><span class="text"></span></div></td>
-                <td><input name="tfStartSearch" style="width:220px" type="text" id="tfStartSearch" class="tfPoints" value="Wallbach" title="Search your start point!" onKeyPress="checkReturn('start',event);" >
+                <td><input name="tfStartSearch" style="width:220px" type="text" id="tfStartSearch" class="tfPoints" value="Berlin, Unter den Eichen" title="Search your start point!" onKeyPress="checkReturn('start',event);" >
                 	<button name="enterStart" onclick="setStatus('start'); geocodeAddress('start');">Search</button></td>
                 <td rowspan="2" valign="middle">
                 	<!-- <button name="switchStartEnd" disabled="true" id="switchStartEnd" type="button"
@@ -43,7 +43,7 @@
 					<div class="textLabel"><img src="img/arrow-finish.png" class="radioIcons" width="12" height="16" alt=""><span class="text"></span></div>                
 				</td>
                 <td id="tdEnd">
-                	<input name="tfEndSearch" style="width:220px" type="text" id="tfEndSearch" class="tfPoints" value="Beuerbach" title="Search your end point!" onKeyPress="checkReturn('end',event);">
+                	<input name="tfEndSearch" style="width:220px" type="text" id="tfEndSearch" class="tfPoints" value="München, Altstadt" title="Search your end point!" onKeyPress="checkReturn('end',event);">
                 	<button name="enterEnd" onclick="setStatus('end'); geocodeAddress('end');">Search</button>
                 </td>
               </tr>