diff --git a/Makefile b/Makefile
index ece8207..312de28 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,27 @@
+ifneq (, $(shell which yui-compressor))
+ YUICOMPRESSOR := 'yui-compressor'
+else ifneq (, $(shell which yuicompressor))
+ YUICOMPRESSOR := 'yuicompressor'
+else
+	 $(error "No YUI Compressor found!")
+endif
+
 all: min/wmaglobe3d.min.js min/utils.min.js min/wmajt_dev.min.js min/wmajt.min.js min/wmacore_dev.min.js min/wmacore.min.js
 
 min/wmaglobe3d.min.js: wmaglobe3d.js
-	yui-compressor wmaglobe3d.js > min/wmaglobe3d.min.js
+	$(YUICOMPRESSOR) wmaglobe3d.js > min/wmaglobe3d.min.js
 
 min/utils.min.js: utils.js
-	yui-compressor utils.js > min/utils.min.js
+	$(YUICOMPRESSOR) utils.js > min/utils.min.js
 
 min/wmajt_dev.min.js: wmajt_dev.js
-	yui-compressor wmajt_dev.js > min/wmajt_dev.min.js
+	$(YUICOMPRESSOR) wmajt_dev.js > min/wmajt_dev.min.js
 
 min/wmajt.min.js: wmajt.js
-	yui-compressor wmajt.js > min/wmajt.min.js
+	$(YUICOMPRESSOR) wmajt.js > min/wmajt.min.js
 
 min/wmacore_dev.min.js: wmacore_dev.js
-	yui-compressor wmacore_dev.js > min/wmacore_dev.min.js
+	$(YUICOMPRESSOR) wmacore_dev.js > min/wmacore_dev.min.js
 
 min/wmacore.min.js: wmacore.js
-	yui-compressor wmacore.js > min/wmacore.min.js
-
+	$(YUICOMPRESSOR) wmacore.js > min/wmacore.min.js