diff --git a/Makefile b/Makefile
index 5b4f4a6..df7d984 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,13 @@
 # External programs:
-ASM = Merlin32.exe -V ~/Merlin32_v1.0/Merlin32_v1.0//Library/ 
-AC = java -jar "C:\Users\Rob\From DOODLE4\Java Applications\AppleCommander releases\AppleCommander-1.3.5.14-ac.jar"
+ifeq ($(OS),Windows_NT)
+  ASM = Merlin32.exe -V ~/Merlin32_v1.0/Merlin32_v1.0//Library/ 
+  AC = java -jar "C:\Users\Rob\From DOODLE4\Java Applications\AppleCommander releases\AppleCommander-1.3.5.14-ac.jar"
+else ($(OS),Mac_OSX)
+  ASM = Merlin32 -V /usr/local/lib/Merlin32_v1.0/Library/
+  AC = java -jar /Applications/AppleCommander.app/Contents/Resources/Java/AppleCommander.jar
+else
+  echo $(OS)
+endif
 
 # Local stuff:
 PGM = afscanner