diff --git a/lib/eventhelpers.rb b/lib/eventhelpers.rb
index 22730bc0..3f1530fe 100644
--- a/lib/eventhelpers.rb
+++ b/lib/eventhelpers.rb
@@ -4,7 +4,8 @@ end
 
 def generate_event_pages()
   articles = get_events()
-  generate_yearly_archive(articles, :startdate, '/events', 'Veranstaltungen des CCC Stuttgart', 'event_archive')
+  generate_yearly_archive(articles, :startdate, '/events', 'Veranstaltungen des CCC Stuttgart',
+                          'event_archive', { :comingtitle => 'Kommende Veranstaltungen', :pasttitle => 'Vergangene Veranstaltungen' })
 end
 
 def get_activities()
@@ -13,7 +14,8 @@ end
 
 def generate_activity_pages()
   articles = get_activities()
-  generate_yearly_archive(articles, :startdate, '/activities', 'Aktionen und Aktivitäten', 'event_archive')
+  generate_yearly_archive(articles, :startdate, '/activities', 'Aktionen und Aktivitäten',
+                          'event_archive', { :comingtitle => 'Kommende Aktionen', :pasttitle => 'Vergangene Aktionen' })
 end
 
 def get_regulars_tables()
diff --git a/lib/yearlyarchive.rb b/lib/yearlyarchive.rb
index beecf98e..6a321ba6 100644
--- a/lib/yearlyarchive.rb
+++ b/lib/yearlyarchive.rb
@@ -1,6 +1,6 @@
 require 'ostruct'
 
-def generate_yearly_archive(articles, date_attribute, basepath, title, templatename = 'article_archive')
+def generate_yearly_archive(articles, date_attribute, basepath, title, templatename = 'article_archive', attributes = {})
   currentyear = Time.now.year
   yearmap = articles.group_by { |item| item[date_attribute].year }
   if !yearmap.has_key?(currentyear)
@@ -22,7 +22,7 @@ def generate_yearly_archive(articles, date_attribute, basepath, title, templaten
     end
     @items << Nanoc::Item.new(
       "<%= render '#{templatename}' #{linkprev} #{linknext} %>",
-      { :title => "#{title} #{year}", :kind => "page", :archiveitems => yearmap[year] },
+      attributes.merge({ :title => "#{title} #{year}", :kind => "page", :archiveitems => yearmap[year] }),
       "#{basepath}/#{year}/")
   }
 end