diff --git a/Makefile b/Makefile
index 93c7f8b..7aceb2c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,10 @@
-ALL: $(patsubst dates/%.yaml, dates/%, $(wildcard dates/*.yaml))
+TARGETS=$(patsubst dates/%.yaml, dates/%, $(wildcard dates/*.yaml))
+ALL: clean ${TARGETS}
 
-dates/%: dates/%.yaml
+clean:
+	rm -rf ${TARGETS}
+
+dates/%:
 	mkdir -p $@
-	./generate.rb $< $@
+	./generate.rb $@.yaml $@
 	make -C $@
diff --git a/dates/16_06_22.yaml b/dates/16_06_22.yaml
index 75ea5b4..b18f587 100644
--- a/dates/16_06_22.yaml
+++ b/dates/16_06_22.yaml
@@ -1,5 +1,5 @@
 title: Digitale Selbstverteidigung
-author: Marius
+presenters: Marius
 organization: Chaos Computer Club Dresden
 date: 22.06.2016
 
diff --git a/latex_template.tex.erb b/latex_template.tex.erb
index 47cfbbc..a3e59a7 100644
--- a/latex_template.tex.erb
+++ b/latex_template.tex.erb
@@ -21,9 +21,9 @@
 \pgfsetlayers{main,foreground}
 \logo{\pgfputat{\pgfxy(-1,0)}{\pgfbox[center,base]{\pgfuseimage{c3d2logo}}}}
 
-\title{<%= @title %>}
-\author{\small <%= @presenters %> \\\large Chaos Computer Club Dresden}
-\date{<%= @date %>}
+\title{<%= lecture['title'] %>}
+\author{\small <%= lecture['presenters'] %> \\\large <%= lecture['organization'] %>}
+\date{<%= lecture['date'] %>}
 
 \begin{document}
 \maketitle