diff --git a/Makefile b/Makefile
index 8d5b3cf3e..6fd7b6a7a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 name := 4chan-X
 
-ifeq "$(OS)" "Windows_NT"
+ifdef ComSpec
   BIN := $(subst /,\,node_modules/.bin/)
   RMDIR := -rmdir /s /q
   RM := -del
@@ -87,8 +87,7 @@ imports_bottom := \
  tmp/style.css
 
 imports_font_awesome := \
- node_modules/font-awesome/css/font-awesome.css \
- node_modules/font-awesome/fonts/fontawesome-webfont.woff
+ node_modules/font-awesome/package.json
 imports_style := \
  $(wildcard src/Linkification/icons/*.png)
 
@@ -115,11 +114,11 @@ all : bds jshint install
 .events tmp testbuilds builds :
 	$(MKDIR)
 
-.events/npm : npm-shrinkwrap.json | .events
-	npm install
+.events/npm.% : npm-shrinkwrap.json | .events
+	npm install $*
 	echo -> $@
 
-node_modules/% : .events/npm
+node_modules/%/package.json : .events/npm.%
 	
 
 .tests_enabled :