diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index 17377e8..6a5f5d3
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@
 ECHO_N = echo -n
 JAVA = java
 PGVERSION = 1.7.0
+UNAME := $(shell uname)
 
 NAME = `$(CAT) framework/appinfo.json | $(GREP) '"id"' | $(CUT) -d \" -f 4`
 VERSION = `$(CAT) framework/appinfo.json | $(GREP) '"version"' | $(CUT) -d \" -f 4`
@@ -31,31 +32,50 @@
 
 clean_libs:
 	-$(RM_RF) lib
-	
+
 package:
-ifeq ($(findstring palm-package.bat,$(wildcard *.bat)), )
+ifeq ($(UNAME), Linux)
 	palm-package framework/
 else
+ifeq ($(UNAME), Darwin)
+# mac OSX
+	palm-package framework/
+else
+# assume windows OS
 	palm-package.bat framework/
 endif
-	
+endif
+
+
 deploy:
-ifeq ($(findstring palm-install.bat,$(wildcard *.bat)), )
+ifeq ($(UNAME), Linux)
 	palm-install $(NAME)_$(VERSION)_all.ipk
 else
+ifeq ($(UNAME), Darwin)
+# mac OSX
+	palm-install $(NAME)_$(VERSION)_all.ipk
+else
+# assume windows OS
 	palm-install.bat $(NAME)_$(VERSION)_all.ipk
 endif
-	
+endif
+
 run:
-ifeq ($(findstring palm-install.bat,$(wildcard *.bat)), )
+ifeq ($(UNAME), Linux)
 	palm-launch $(NAME)
 else
+ifeq ($(UNAME), Darwin)
+# mac OSX
+	palm-launch $(NAME)
+else
+# assume windows OS
 	palm-launch.bat $(NAME)
 endif
-	
+endif
+
 copy_js:
 	cp lib/cordova.js framework/cordova-$(PGVERSION).js
-	
+
 js: lib/cordova.js
 
 lib/cordova.js: js/cordova-core.js js/acceleration.js js/accelerometer.js js/application.js js/audio.js js/camera.js js/compass.js js/contacts.js js/debugconsole.js js/device.js js/file.js js/geolocation.js js/map.js js/mojo.js js/mouse.js js/network.js js/notification.js js/orientation.js js/position.js js/service.js js/sms.js js/telephony.js js/window.js js/windowproperties.js lib/thumbs.0.5.2.js
@@ -85,4 +105,4 @@
 	$(CAT) js/telephony.js >> $@
 	$(CAT) js/window.js >> $@
 	$(CAT) js/windowproperties.js >> $@
-	$(CAT) lib/thumbs.0.5.2.js >> $@
+	$(CAT) lib/thumbs.0.5.2.js >> $@
\ No newline at end of file