diff --git a/content/styles/_customstyles.scss b/content/styles/_customstyles.scss
index 6bd00774..85757e02 100644
--- a/content/styles/_customstyles.scss
+++ b/content/styles/_customstyles.scss
@@ -115,20 +115,19 @@ ul.horizontal {
 
 div.commaseparated {
   clear: both;
-}
-
-ul.commaseparated {
-  display: inline;
-  list-style-type: none;
-  margin: 0;
-  li {
+  ul {
     display: inline;
-  }
-  li:after {
-    content: ", ";
-  }
-  li:last-child:after {
-    content: "";
+    list-style-type: none;
+    margin: 0;
+    li {
+      display: inline;
+    }
+    li:after {
+      content: ", ";
+    }
+    li:last-child:after {
+      content: "";
+    }
   }
 }
 
diff --git a/layouts/event_body.html b/layouts/event_body.html
index 872bf0a4..740f4133 100644
--- a/layouts/event_body.html
+++ b/layouts/event_body.html
@@ -10,7 +10,7 @@
                   <br />
                   <div class="commaseparated">
                     <strong>Referent:</strong>
-                    <ul class="commaseparated">
+                    <ul>
                       <% @item[:speakers].each do |speaker|  %>
                       <li itemprop="performer" itemscope itemtype="http://schema.org/Person">
                         <span itemprop="name"><%= speaker[:name] %></span><% if speaker[:affiliation]%> (<%= speaker[:affiliation] %>)<% end %>
@@ -18,10 +18,25 @@
                       <% end %>
                     </ul>
                   </div>
-                  <strong>Ort:</strong>
-                  <span itemprop="location" itemscope itemtype="http://schema.org/Location">
-                    <span itemprop="name">Stadtbibliothek am Mailänder Platz</span>, Max-Bense-Forum (UG)
-                  </span>
+                  <div class="commaseparated">
+                    <strong>Ort:</strong>
+                    <ul itemprop="location" itemscope itemtype="http://schema.org/Location">
+                      <li itemprop="name"><% if item[:location][:url] %><a itemprop="url" href="<%= item[:location][:url] %>"><%= item[:location][:name] %></a><% else %><%= item[:location][:name] %><% end %>
+                      <% if item[:location][:details] %><li><%= item[:location][:details] %><% end %>
+                      <span itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
+                        <% if item[:location][:strasse] %><li itemprop="streetAddress"><%= item[:location][:strasse] %><% end %>
+                        <% if item[:location][:ort] %><li><span itemprop="postalCode"><%= item[:location][:plz] %></span> <span itemProp="addressLocality"><%= item[:location][:ort] %></span><% end %>
+                      </span>
+                      <% if item[:location][:lon] %>
+                      <li>
+                        <span itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
+                          N<span itemprop="latitude"><%= item[:location][:lat] %></span>
+                          E<span itemprop="longitude"><%= item[:location][:lon] %></span>
+                        </span>
+                        (<a itemprop="map" href="http://www.openstreetmap.org/?mlat=<%= item[:location][:lat] %>&mlon=<%= item[:location][:lon] %>&zoom=18#map=16/<%= item[:location][:lat] %>/<%= item[:location][:lon] %>">Karte</a>)
+                      <% end %>
+                    </ul>
+                  </div>
                 </header>
                 <section itemprop="description">
                   <%= yield %>