diff --git a/build.sh b/build.sh
index 8b3961d..d8d7f59 100644
--- a/build.sh
+++ b/build.sh
@@ -1,12 +1,15 @@
 #!/bin/sh
 
 mkdir -p out/
-
-python3 generate.py de daten/stundenplan-bachelor.json out/stupla_bachelor stundenplan-vorlage.tex
-python3 generate.py en daten/stundenplan-bachelor.json out/stupla_bachelor stundenplan-vorlage.tex
-python3 generate.py de daten/stundenplan-master.json out/stupla_master stundenplan-vorlage.tex
-python3 generate.py en daten/stundenplan-master.json out/stupla_master stundenplan-vorlage.tex
+languages=("de" "en")
 
 mkdir -p pdfs/
-mv out/*.pdf pdfs/.
+for lang in "${languages[@]}"; do
+	python3 generate.py $lang daten/stundenplan-bachelor.json out/stundenplan-bachelor stundenplan-vorlage.tex
+	python3 generate.py $lang daten/stundenplan-master.json out/stundenplan-master stundenplan-vorlage.tex
+	mkdir -p pdfs/$lang
+	mv out/*.pdf pdfs/$lang/.
+	rm -R out/*
+done
+
 rm -R out/
diff --git a/generate.py b/generate.py
index b954631..e879e5c 100644
--- a/generate.py
+++ b/generate.py
@@ -106,7 +106,7 @@ def main(argv):
 	with open('stundenplan-working-copy.tex', 'w') as f:
 		f.write(template)
 
-	os.system('xelatex --jobname={}_{} stundenplan-working-copy.tex'.format(output_path, language))
+	os.system('xelatex --jobname={} stundenplan-working-copy.tex'.format(output_path))
 
 
 main(sys.argv)