diff --git a/js/calv2.js b/js/calv2.js
index 69727c4..479b175 100644
--- a/js/calv2.js
+++ b/js/calv2.js
@@ -130,7 +130,7 @@ Event.prototype.toHTML = function () {
 		div_description.setAttribute('class', 'cal_descriptionbox')
 		div_description.appendChild(span_summary)
 
-		if (this.location !== false && !/s(ibyllastra(ss|ß)e )9/i.test(this.location)) {
+		if (this.location !== false) {
 			var span_location = document.createElement('span')
 			span_location.setAttribute('class', 'cal_location')
 
@@ -140,13 +140,14 @@ Event.prototype.toHTML = function () {
 
 			span_location.appendChild(span_location_icon)
 
-			if (this.location.match(/tb(a|d)/i)) {
-				span_location.appendChild(document.createTextNode(this.location))
-			} else {
+			if (/s(ibyllastra(ss|ß)e )9/i.test(this.location)) {
 				var a_location_osm = document.createElement('a')
 				a_location_osm.setAttribute('href', 'https://www.openstreetmap.org/search?query=' + encodeURI(this.location))
 				a_location_osm.appendChild(document.createTextNode(this.location))
 				span_location.appendChild(a_location_osm)
+			} else {
+				span_location.appendChild(document.createTextNode(this.location))
+				span_location.innerHTML = autolinker.link( span_location.innerHTML )
 			}
 
 			div_description.appendChild(span_location)
@@ -286,4 +287,4 @@ function requestFailed(status) {
 	document.getElementById('calendar-recurring').textContent = 'Something has gone wrong. Try reloading the page.'
 }
 
-xhrRequest('https://cloud.chaospott.ru/remote.php/dav/public-calendars/5HM7B0ZOLEYC3QD0?export', processData, requestFailed)
+xhrRequest('https://cloud.chaospott.de/remote.php/dav/public-calendars/5HM7B0ZOLEYC3QD0?export', processData, requestFailed)