diff --git a/Makefile b/Makefile
index c732c704..fb235d22 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,10 @@ all: init css js zip notify
 # Build and minify the CSS files
 css: init
 	# Build the CSS file with the theme included
-	@@node external/r.js/dist/r.js -o cssIn=css/themes/default/jquery.mobile.theme.css out=${OUTPUT}/${NAME}.compiled.css
+	@@java -classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main \
+			external/r.js/dist/r.js \
+			-o cssIn=css/themes/default/jquery.mobile.theme.css \
+			out=${OUTPUT}/${NAME}.compiled.css
 	@@cat LICENSE-INFO.txt | ${VER} > ${OUTPUT}/${NAME}.css
 	@@cat ${OUTPUT}/${NAME}.compiled.css >> ${OUTPUT}/${NAME}.css
 	@@echo ${VER_MIN} > ${OUTPUT}/${NAME}.min.css
@@ -101,7 +104,9 @@ init:
 # Build and minify the JS files
 js: init
 	# Build the JavaScript file
-	@@node external/r.js/dist/r.js -o baseUrl="js" \
+	@@java -classpath build/js.jar:build/google-compiler-20111003.jar org.mozilla.javascript.tools.shell.Main \
+			external/r.js/dist/r.js \
+		 	-o baseUrl="js" \
 			include=jquery.mobile,jquery.mobile.exports exclude=jquery,order \
 			out=${OUTPUT}/${NAME}.tmp.js \
 			pragmasOnSave.jqmBuildExclude=true \