diff --git a/Makefile b/Makefile
index adeeef7..45fc691 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,10 @@ FULL_BUNDLE_NAME_FINAL="Druckversion Masterarbeit Konzeption und Umsetzung IPv6-
 
 LAST_EXPORT=`cat LAST_EXPORT`
 
+# Custom command enhancements
+PDFLATEX=pdflatex -shell-escape -interaction=nonstopmode -file-line-error -output-directory build
+PDFLATEXGREP=| grep -q -i ".*:[0-9]*:.*\|warning"
+
 default: cleanall render_all
 
 render_all: render_all_md render_all_html render_all_pdf
@@ -34,10 +38,10 @@ render_ma_html:
 	cp build/${MA_NAME}.html release/${MA_NAME_FINAL}.html
 
 render_ma_pdf:
-	pdflatex -output-directory build ${MA_NAME}.tex
+	${PDFLATEX} ${MA_NAME}.tex ${PDFLATEXGREP}
 	bibtex build/${MA_NAME}
-	pdflatex -output-directory build ${MA_NAME}.tex
-	pdflatex -output-directory build ${MA_NAME}.tex
+	${PDFLATEX} ${MA_NAME}.tex ${PDFLATEXGREP}
+	${PDFLATEX} ${MA_NAME}.tex ${PDFLATEXGREP}
 	cp build/${MA_NAME}.pdf release/${MA_NAME_FINAL}.pdf
 
 render_ca_doc_md:
@@ -49,10 +53,8 @@ render_ca_doc_html:
 	cp build/${CA_DOC_NAME}.html release/${CA_DOC_NAME_FINAL}.html
 
 render_ca_doc_pdf:
-	pdflatex -output-directory build ${CA_DOC_NAME}.tex
-	#bibtex build/${CA_DOC_NAME}
-	#pdflatex -output-directory build ${CA_DOC_NAME}.tex
-	pdflatex -output-directory build ${CA_DOC_NAME}.tex
+	${PDFLATEX} ${CA_DOC_NAME}.tex ${PDFLATEXGREP}
+	${PDFLATEX} ${CA_DOC_NAME}.tex ${PDFLATEXGREP}
 	cp build/${CA_DOC_NAME}.pdf release/${CA_DOC_NAME_FINAL}.pdf
 
 render_srv_doc_md:
@@ -64,10 +66,8 @@ render_srv_doc_html:
 	cp build/${SRV_DOC_NAME}.html release/${SRV_DOC_NAME_FINAL}.html
 
 render_srv_doc_pdf:
-	pdflatex -output-directory build ${SRV_DOC_NAME}.tex
-	#bibtex build/${SRV_DOC_NAME}
-	#pdflatex -output-directory build ${SRV_DOC_NAME}.tex
-	pdflatex -output-directory build ${SRV_DOC_NAME}.tex
+	${PDFLATEX} ${SRV_DOC_NAME}.tex ${PDFLATEXGREP}
+	${PDFLATEX} ${SRV_DOC_NAME}.tex ${PDFLATEXGREP}
 	cp build/${SRV_DOC_NAME}.pdf release/${SRV_DOC_NAME_FINAL}.pdf
 
 render_clnt_doc_md:
@@ -79,14 +79,12 @@ render_clnt_doc_html:
 	cp build/${CLNT_DOC_NAME}.html release/${CLNT_DOC_NAME_FINAL}.html
 
 render_clnt_doc_pdf:
-	pdflatex -output-directory build ${CLNT_DOC_NAME}.tex
-	#bibtex build/${CLNT_DOC_NAME}
-	#pdflatex -output-directory build ${CLNT_DOC_NAME}.tex
-	pdflatex -output-directory build ${CLNT_DOC_NAME}.tex
+	${PDFLATEX} ${CLNT_DOC_NAME}.tex ${PDFLATEXGREP}
+	${PDFLATEX} ${CLNT_DOC_NAME}.tex ${PDFLATEXGREP}
 	cp build/${CLNT_DOC_NAME}.pdf release/${CLNT_DOC_NAME_FINAL}.pdf
 
 render_full_bundle_pdf:
-	pdflatex -output-directory build ${FULL_BUNDLE_NAME}.tex
+	${PDFLATEX} ${FULL_BUNDLE_NAME}.tex ${PDFLATEXGREP}
 	cp build/${FULL_BUNDLE_NAME}.pdf release/${FULL_BUNDLE_NAME_FINAL}.pdf