Index: trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/exercisesheet/PdfGenerator.java
===================================================================
--- trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/exercisesheet/PdfGenerator.java	(revision 14)
+++ trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/exercisesheet/PdfGenerator.java	(revision 15)
@@ -61,4 +61,5 @@
 			filename += ".tex";
 
+			// read template file
 			File templateFile = new File(filename);
 			String template = "";
@@ -72,4 +73,5 @@
 			dstream.close();
 
+			// initialize strings			
 			LectureEvent event = exercisesheet.getLectureEvent();
 			ArrayList<Lecturer> lecturers = event.getLecturers();
@@ -120,5 +122,5 @@
 			dueDate.setTimeInMillis(dueDateTimeStamp);
 			DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.GERMANY);
-			String deliveryDate = dateFormat.format(dueDate.getTime());
+			String dueDateString = dateFormat.format(dueDate.getTime());
 			
 			template = template.replaceAll("(\\W)LECTURE(\\W)", "$1"
@@ -135,6 +137,6 @@
 			template = template.replaceAll("(\\W)TEMPLATEPATH(\\W)", "$1"
 					+ Matcher.quoteReplacement(templatePath) + "$2");
-			template = template.replaceAll("(\\W)DELIVERYDATE(\\W)", "$1"
-					+ Matcher.quoteReplacement(deliveryDate) + "$2");
+			template = template.replaceAll("(\\W)DUEDATE(\\W)", "$1"
+					+ Matcher.quoteReplacement(dueDateString) + "$2");
 
 			// write temporary .tex file to temp directory
Index: trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/lectureevent/LectureEvent.java
===================================================================
--- trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/lectureevent/LectureEvent.java	(revision 14)
+++ trunk/de.ugoe.cs.swe.exercises/src/de/ugoe/cs/swe/exercises/lectureevent/LectureEvent.java	(revision 15)
@@ -46,5 +46,10 @@
 	@Override
 	public String toString() {
-		return (getLecture().getName() + " " + getSemesterString() + getSemester());
+		if (!isSummerSemester) {
+			int nextYear = getSemester()+1;
+			return (getLecture().getName() + " (" + getSemesterString() + " " + getSemester() + "/" + nextYear + ")");
+		} else {
+			return (getLecture().getName() + " (" + getSemesterString() + " " + getSemester() + ")");
+		}
 	}