diff --git a/Makefile b/Makefile
index 82a92837a..cc7768876 100644
--- a/Makefile
+++ b/Makefile
@@ -27,11 +27,11 @@ install-deps:
 
 build: build-js
 
-build-js:
-	$(MAKE) -C js build
+build-js: install-deps
+	cd js && ./node_modules/.bin/grunt build
 
 watch:
-	$(make) -C js watch
+	cd js && ./node_modules/.bin/grunt watch
 
 # appstore: clean install-deps
 appstore: clean-build build
diff --git a/js/Makefile b/js/Makefile
deleted file mode 100644
index 520ccc77b..000000000
--- a/js/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-build:
-	./node_modules/.bin/grunt build
-
-watch:
-	./node_modules/.bin/grunt watch
-
-install:
-	npm install
-	./node_modules/.bin/bower install
-