diff --git a/.gitignore b/.gitignore
index 9855f3d1..eaa2bf6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ config
 stamp-h1
 src/hydra-evaluator/hydra-evaluator
 src/hydra-queue-runner/hydra-queue-runner
+src/root/static/fontawesome/
diff --git a/src/root/Makefile.am b/src/root/Makefile.am
index 4ea4f85e..640296b1 100644
--- a/src/root/Makefile.am
+++ b/src/root/Makefile.am
@@ -22,15 +22,16 @@ nobase_hydra_DATA = $(EXTRA_DIST)
 all:
 	mkdir -p $(srcdir)/static/js
 	unzip -u -d $(srcdir)/static $(BOOTSTRAP)
+	mv $(srcdir)/static/$(basename $(BOOTSTRAP)) $(srcdir)/static/bootstrap
 	unzip -u -d $(srcdir)/static/js $(FLOT)
 	unzip -u -d $(srcdir)/static $(FONTAWESOME)
+	mv $(srcdir)/static/$(basename $(FONTAWESOME)) $(srcdir)/static/fontawesome
 
 install-data-local: $(ZIPS)
 	mkdir -p $(hydradir)/static/js
 	cp -prvd $(srcdir)/static/js/* $(hydradir)/static/js
 	mkdir -p $(hydradir)/static/bootstrap
-	cp -prvd $(srcdir)/static/$(basename $(BOOTSTRAP))/* $(hydradir)/static/bootstrap
-	mkdir -p $(hydradir)/static/fontawesome/css
-	cp -prvd $(srcdir)/static/$(basename $(FONTAWESOME))/css/all.css $(hydradir)/static/fontawesome/css
-	mkdir -p $(hydradir)/static/fontawesome/webfonts
-	cp -prvd $(srcdir)/static/$(basename $(FONTAWESOME))/webfonts/* $(hydradir)/static/fontawesome/webfonts
+	cp -prvd $(srcdir)/static/bootstrap/* $(hydradir)/static/bootstrap
+	mkdir -p $(hydradir)/static/fontawesome/{css,webfonts}
+	cp -prvd $(srcdir)/static/fontawesome/css/* $(hydradir)/static/fontawesome/css
+	cp -prvd $(srcdir)/static/fontawesome/webfonts/* $(hydradir)/static/fontawesome/webfonts