diff --git a/index.html b/index.html
index 8bfa2c717cd91d166632dad6c16e06f26ca147d7..ffc71b4af21bfe6cbda66875595561b9e525ddea 100644
--- a/index.html
+++ b/index.html
@@ -35,7 +35,7 @@
 			The <a href="http://ecrts14.ecrts.org/">26th Euromicro Conference on Real-Time Systems (ECRTS14)</a> was held in Madrid, Spain. ECRTS can be found on <a href="http://www.linkedin.com/groupRegistration?gid=1970956">linkedin.com</a>, <a href="http://twitter.com/ecrts">twitter</a> and <a href="https://www.facebook.com/ecrts">facebook</a>.<br><br>
 
 			<h4>News</h4>
-			17.06.2015 - A <a href="https://goo.gl/7XBaCH">map of the relevant locations</a> is available (workshops are going to be in the E-building, the main conference in Palaestra, and the map shows also the pick-up point for the dinner and the department of automatic control for the newcomers reception)<br>
+			17.06.2015 - A <a href="https://www.google.com/maps/@55.7004039,13.1908544,13z/data=!4m2!6m1!1szyh264UoAHsw.kuBf-Zno2gI8">map of the relevant locations</a> is available (workshops are going to be in the E-building, the main conference in Palaestra, and the map shows also the pick-up point for the dinner and the department of automatic control for the newcomers reception)<br>
 			16.06.205 - We are using the conference4me mobile app. To download mobile app, please visit <a href="http://conference4me.eu/download">http://conference4me.eu/download</a> or 
 type 'conference4me' in Google Play, iTunes App Store, Windows Phone 
 Store or Amazon Appstore.<br>
diff --git a/news.html b/news.html
index 11f9e340272d230addfd33cd9dc210989b6ea15d..2e0013f35f5c6d92a3821ed742a402ea5487b4c3 100644
--- a/news.html
+++ b/news.html
@@ -27,7 +27,7 @@
 			<img src="img/logo.png">
 
 			<h4>News</h4><br>
-			17.06.2015 - A <a href="https://goo.gl/7XBaCH">map of the relevant locations</a> is available (workshops are going to be in the E-building, the main conference in Palaestra, and the map shows also the pick-up point for the dinner and the department of automatic control for the newcomers reception)<br>
+			17.06.2015 - A <a href="https://www.google.com/maps/@55.7004039,13.1908544,13z/data=!4m2!6m1!1szyh264UoAHsw.kuBf-Zno2gI8">map of the relevant locations</a> is available (workshops are going to be in the E-building, the main conference in Palaestra, and the map shows also the pick-up point for the dinner and the department of automatic control for the newcomers reception)<br>
 			16.06.2015 - We are using the conference4me mobile app. To download mobile app, please visit <a href="http://conference4me.eu/download">http://conference4me.eu/download</a> or 
 type 'conference4me' in Google Play, iTunes App Store, Windows Phone 
 Store or Amazon Appstore.<br>
diff --git a/program.html b/program.html
index a7d613b25e6d1b2c1d5992113d138c9ccb6d0712..f0d4f4bf7c34bf4a6136a897953cc29dbbfee3c3 100644
--- a/program.html
+++ b/program.html
@@ -51,14 +51,14 @@ Store or Amazon Appstore.<br><br><br>
 
 			<ul>
 				<li>09:00 - 17:00<br>
-					  Workshops: <a href="https://goo.gl/7XBaCH">map of the locations</a><br>
+					  Workshops (E-building): <a href="https://www.google.com/maps/@55.7004039,13.1908544,13z/data=!4m2!6m1!1szyh264UoAHsw.kuBf-Zno2gI8">map of the locations</a><br>
 					  <a href="http://2015.rtsops.org/" target="_blank">RTSOPS 2015</a>,
 					  <a href="http://www.bsc.es/caos/wcet2015" target="_blank">WCET 2015</a>,
 					  <a href="http://www.mpi-sws.org/~bbb/events/ospert15/" target="_blank">OSPERT 2015</a>,
 					  <a href="http://waters2015.inria.fr/" target="_blank">WATERS 2015</a>
 					</li>
 				<li>17:30<br>
-				Newcomer's reception. There will be a reception for the people who registered to the conference as a newcomer (first time at ECRTS). The reception will be right after the workshops, at 17.30, in the seminar room of the Department of Automatic Control (M-building – Maskinteknik), on the second floor. Newcomers are encouraged to participate in the event. You will have the opportunity to meet some of the main experts in the real-time systems community, and also to get to know each other.
+				Newcomer's reception. There will be a reception for the people who registered to the conference as a newcomer (first time at ECRTS). The reception will be right after the workshops, at 17.30, in the seminar room of the Department of Automatic Control (M-building – Maskinteknik, <a href="https://www.google.com/maps/@55.7004039,13.1908544,13z/data=!4m2!6m1!1szyh264UoAHsw.kuBf-Zno2gI8">map</a>), on the second floor. Newcomers are encouraged to participate in the event. You will have the opportunity to meet some of the main experts in the real-time systems community, and also to get to know each other.
 				</li>
 			</ul>
 
@@ -70,7 +70,7 @@ Store or Amazon Appstore.<br><br><br>
 
 			<ul>
 				<li>08:00 - 12:00<br>
-					  Registration<br><br>
+					  Registrationi (Palaestra, <a href="https://www.google.com/maps/@55.7004039,13.1908544,13z/data=!4m2!6m1!1szyh264UoAHsw.kuBf-Zno2gI8">map</a><br><br>
 				</li>
 
 				<li>08:45 - 09:00<br>