diff --git a/Makefile b/Makefile
index 1ab8e14..6e35dbd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,16 @@
 BOOTSTRAPVER=3.3.2
 JQUERYVER=2.1.1
+FONTS=robotech-gp.ttf robotaur.ttf
+
+BOOTSTRAPNEEDED=js/bootstrap.min.js css/bootstrap.min.css fonts/glyphicons-halflings-regular.*
 
 REDIRS=$(shell cd pages; echo *.php)
 BOOTSTRAPNAME=bootstrap-$(BOOTSTRAPVER)-dist
 
-all: redirs $(BOOTSTRAPNEEDED) js/jquery.min.js
+all: redirs $(BOOTSTRAPNEEDED) js/jquery.min.js	$(addprefix fonts/,$(FONTS))
 	cd img; make
 
+# Redirs
 %.php: pages/%.php
 	echo "<?php require('index.php') ?>" > $@
 
@@ -15,15 +19,12 @@ redirs: $(REDIRS)
 js/jquery.min.js:
 	wget http://code.jquery.com/jquery-$(JQUERYVER).min.js -O $@
 
-bootstrap:
+$(BOOTSTRAPNEEDED):
 	wget https://github.com/twbs/bootstrap/releases/download/v$(BOOTSTRAPVER)/$(BOOTSTRAPNAME).zip -O $(BOOTSTRAPNAME).zip
-	unzip $(BOOTSTRAPNAME).zip $(BOOTSTRAPNAME)/fonts/* $(BOOTSTRAPNAME)/css/bootstrap.min.css $(BOOTSTRAPNAME)/js/bootstrap.min.js
+	unzip $(BOOTSTRAPNAME).zip $(addprefix $(BOOTSTRAPNAME),$(BOOTSTRAPNEEDED))
 	cp -rf $(BOOTSTRAPNAME)/* .
 	rm -rf $(BOOTSTRAPNAME)*
 
-bootstrapClean:
-	rm -rf fonts/glyphicons* */bootstrap*
-
 fonts/robotech-gp.ttf:
 	wget http://dl.dafont.com/dl/?f=robotech_gp -O robotech_gp.zip
 	unzip robotech_gp.zip ROBOTECH\ GP.ttf
@@ -37,4 +38,4 @@ fonts/robotaur.ttf:
 
 clean: bootstrapClean
 	cd img; make clean
-	rm -rf $(REDIRS) js/jquery.min.js fonts/robot*.ttf
+	rm -rf $(REDIRS) $(BOOTSTRAPNEEDED) $(addprefix fonts/,$(FONTS)) js/jquery.min.js
--
libgit2 0.21.2