diff --git a/rechnung.sh b/rechnung.sh
index a579664..f3fc5e5 100755
--- a/rechnung.sh
+++ b/rechnung.sh
@@ -20,7 +20,16 @@ CUT_BIN=$(which cut 2>/dev/null || echo "cut")
 DATE_BIN=$(which date 2>/dev/null || echo "date")
 TPUT_BIN=$(which tput 2>/dev/null || echo "tput")
 PDFLATEX_BIN=$(which pdflatex 2>/dev/null || echo "pdflatex")
-EXECUTABLES_TO_CHECK="$BC_BIN $TR_BIN $SED_BIN $CUT_BIN $TPUT_BIN $DATE_BIN $PDFLATEX_BIN"
+RUBBER_BIN=$(which rubber 2>/dev/null || echo "rubber")
+EXECUTABLES_TO_CHECK="$BC_BIN $TR_BIN $SED_BIN $CUT_BIN $TPUT_BIN $DATE_BIN $PDFLATEX_BIN $RUBBER_BIN"
+
+GENPDF=""
+if [ -x $RUBBER_BIN ]; then
+    GENPDF="$RUBBER_BIN -d "
+else
+    GENPDF="$PDFLATEX_BIN -halt-on-error "
+fi
+
 
 # Variablen definieren
 # --------------------
@@ -219,8 +228,11 @@ make_invoice() {
     echo -n "s!#DEADLINE#!" >>$SEDFILE; echo "$inv_dead!" >>$SEDFILE
     cp $TEMPLATEFILE $filename
     $SED_BIN -i -f $SEDFILE $filename
-    $PDFLATEX_BIN -halt-on-error $filename
-    $PDFLATEX_BIN -halt-on-error $filename
+    $GENPDF $filename
+    if [ -x $RUBBER_BIN ]; then
+	$RUBBER_BIN --clean $filename
+    fi
+
     if [ $? -eq 0 ]; then
         echo "[+] Rechnung erfolgreich erstellt"
     else