diff --git a/content/index.html b/content/index.html
index 09bea436..10388ef8 100644
--- a/content/index.html
+++ b/content/index.html
@@ -37,7 +37,7 @@ feed:
     <div class="well well-large">
       <article itemscope itemtype="http://schema.org/EducationEvent">
         <h1><a href="#">Nächster Vortrag</a></h1>
-        <%= render 'event_header', :item => upcomingEvents[0], :heading => false %>
+        <%= render 'event_header', :item => upcomingEvents[0], :heading => false, :link => false %>
         <p>
         <a itemprop="url" href="<%= upcomingEvents[0].path() %>">Weitere Informationen</a> -
           <a href="#">Flyer (PDF)</a> -
diff --git a/layouts/event_archive.erb b/layouts/event_archive.erb
index b927d809..e0a7c09a 100644
--- a/layouts/event_archive.erb
+++ b/layouts/event_archive.erb
@@ -2,7 +2,9 @@
 <div class="row">
   <% @item[:archiveitems].each do |item| %>
   <div class="span8">
-    <%= render 'item_intro', :item => item, :extended => true %>
+    <article itemscope itemtype="http://schema.org/EducationEvent">
+      <%= render 'event_header', :item => item, :heading => true, :link => true %>
+    </article>
     <p>
     <a href="<%= item.path() %>">Zum Artikel</a>
   </div>
diff --git a/layouts/event_body.html b/layouts/event_body.html
index 83e3bac7..b058efe8 100644
--- a/layouts/event_body.html
+++ b/layouts/event_body.html
@@ -3,7 +3,7 @@
           <div class="row">
             <div class="span8">
               <article itemscope itemtype="http://schema.org/EducationEvent">
-                <%= render 'event_header', :item => item, :heading => true %>
+                <%= render 'event_header', :item => item, :heading => true, :link => false %>
                 <hr>
                 <section itemprop="description">
                   <%= yield %>
diff --git a/layouts/event_header.erb b/layouts/event_header.erb
index 453682c7..9dc36b5e 100644
--- a/layouts/event_header.erb
+++ b/layouts/event_header.erb
@@ -1,5 +1,11 @@
                 <header>
-                  <% if heading %><h1 itemprop="name"><%= item[:title] %></h1><% end %>
+                  <% if heading %>
+                  <% if link %>
+                  <h1 itemprop="name"><a itemProp="url" href="<%= item.path() %>"><%= item[:title] %></a></h1>
+                  <% else %>
+                  <h1 itemprop="name"><%= item[:title] %></h1>
+                  <% end %>
+                  <% end %>
                   <strong>Termin:</strong>
                   <span itemprop="startDate" content="<%= @item[:startdate].strftime("%Y-%m-%d") %>T19:30"><%= @item[:startdate].strftime("%d.%m.%Y") %>, 19:30 Uhr</span>
                   <br />