diff --git a/content/events/15-16/awk.md b/content/events/15-16/awk.md
index 6b93e13..5207aba 100644
--- a/content/events/15-16/awk.md
+++ b/content/events/15-16/awk.md
@@ -5,6 +5,7 @@ description: Een AWK-les voor AWK gerelateerde dingen
 created_at: 01-02-2016
 time: 23-02-2016
 location: Auditorium A1, Campus Sterre, Gebouw S9
+locationlink: Zeus WPI,Ghent Belgium
 description: Dit is een description van het awk event!
 ---
 
diff --git a/content/events/16-17/LAN.md b/content/events/16-17/LAN.md
index b7bb0c5..6cb52d9 100644
--- a/content/events/16-17/LAN.md
+++ b/content/events/16-17/LAN.md
@@ -5,6 +5,7 @@ description: Zeus' vijfde LAN-Party
 created_at: 13-09-2016
 time: 4-11-2016
 location: Therminal, Hoveniersberg 24 9000 Gent
+locationlink: Therminal,Ghent Belgium
 description: Zeus' vijfde LAN-Party
 ---
 
diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb
index fe3702e..d895d83 100644
--- a/layouts/eventpost.erb
+++ b/layouts/eventpost.erb
@@ -52,8 +52,7 @@
     <div class="google-maps column is-8 is-offset-2">
       <iframe
         frameborder="0" style="border:0"
-        src="https://www.google.com/maps/embed/v1/place?key=AIzaSyBDTmw7LtDG28o9QjCnNucAJv2zTZpLjJU
-          &q=Zeus+WPI,Ghent+Belgium" allowfullscreen>
+        src="<%= locationlink item[:locationlink] %>" allowfullscreen>
       </iframe>
     </div>
   </div>
diff --git a/lib/helpers/events.rb b/lib/helpers/events.rb
index 181806c..e278544 100644
--- a/lib/helpers/events.rb
+++ b/lib/helpers/events.rb
@@ -1,3 +1,4 @@
+require 'uri'
 module EventsHelper
   def all_events
     @items.find_all('/events/*/*') + grouped_events
@@ -17,4 +18,8 @@ module EventsHelper
       []
     end
   end
+
+  def locationlink(location)
+    "https://www.google.com/maps/embed/v1/place?key=AIzaSyBDTmw7LtDG28o9QjCnNucAJv2zTZpLjJU&q=#{URI.escape(location)}" if location
+  end
 end