diff --git a/Makefile b/Makefile
index 0049924..d817e8d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,23 @@
-target:
-	pdflatex thesis.tex
+IMAGEDIR := images
+IMAGES := $(foreach image,$(filter %.jpeg %.jpg %.png, $(wildcard $(IMAGEDIR)/*)),$(addsuffix .ps, $(basename $(image))))
+
+target: thesis.pdf
+
+thesis.pdf: thesis.tex bibliography.bib $(images)
+	latex -file-line-error -draftmode thesis.tex
+	bibtex8 thesis
+	latex -file-line-error -output-format pdf thesis 
+
+$(IMAGEDIR)/%.ps : $(IMAGEDIR)/%.jpeg
+	convert $< $@
+$(IMAGEDIR)/%.ps : $(IMAGEDIR)/%.jpg
+	convert $< $@
+$(IMAGEDIR)/%.ps : $(IMAGEDIR)/%.png
+	convert $< $@
+
+.SECONDARY: %.ps
+
+images: $(IMAGES)
 
 clean:
-	rm -f *.aux *.lof *.log *.fls *.out *.toc *.fmt *.fot *.cb *.cb2 .*.lb *.ist *.dvi *.xdv *.run.xml *.bcf *.blg *.acr *.glg *.bbl *.glsdefs *.acn *.glo *.lot *.alg
+	rm -f *.aux *.lof *.log *.fls *.out *.toc *.fmt *.fot *.cb *.cb2 .*.lb *.ist *.dvi *.xdv *.run.xml *.bcf *.blg *.acr *.glg *.bbl *.glsdefs *.acn *.glo *.lot *.alg *.pdf