diff --git a/.gitignore b/.gitignore
index 347e4a4..2e0c132 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+# Binary outputs of build
+online
+online.dsk
+
 # Vim swap files
 .*.swp
 
diff --git a/Makefile b/Makefile
index eb34a44..8178bd9 100644
--- a/Makefile
+++ b/Makefile
@@ -14,23 +14,16 @@
 #        - To load the disk and test the program
 #
 ifeq ($(OS),Windows_NT)
-    MERLIN_DIR=C:/opt/Merlin32_v1.0
-    MERLIN_LIB=$(MERLIN_DIR)/Library
-    MERLIN=$(MERLIN_DIR)/Windows/Merlin32
     COPY=copy
     APPLEWIN="c:\opt\AppleWin1.26.2.3\applewin.exe"
 else
-    MERLIN_PREFIX=/usr/local
-    MERLIN_LIB=$(MERLIN_PREFIX)/share/merlin32/asminc
-    MERLIN=$(MERLIN_PREFIX)/bin/merlin32
     COPY=cp
     APPLEWIN=applewin
 endif
 
-MERLIN_URL=https://www.brutaldeluxe.fr/products/crossdevtools/merlin/Merlin32_v1.0.zip
-
 # It is necessary to use this older version of AppleCommander to support
 # the PowerBook G4 and iBook G3. This version only requires Java 1.3.
+MERLIN=merlin32
 AC=java -jar AppleCommander-1.3.5-ac.jar
 SRC=online.s
 PGM=online
@@ -48,38 +41,13 @@ $(DSK): $(PGM)
 	# Does not work on older AC
 	#$(AC) -n $(DSK) $(VOL)
 	$(AC) -p $(DSK) $(PGM) SYS < $(PGM)
-	cat $(PGM).VER.bas | tr '\n' '\r' | $(AC) -p $(DSK) $(PGM).VER TXT
+	cat $(PGM).ver.bas | tr '\n' '\r' | $(AC) -p $(DSK) $(PGM).VER TXT
 
-$(PGM): $(SRC) $(MERLIN) $(MERLIN_LIB)
-	$(MERLIN) $(MERLIN_LIB) $(SRC)
-
-$(MERLIN): Merlin32_v1.0/Source/Merlin32
-	( cd Merlin32_v1.0/Source; \
-	sudo install Merlin32 $(MERLIN) )
-
-$(MERLIN_LIB): Merlin32_v1.0
-	sudo install -d $(MERLIN_LIB)
-	( cd Merlin32_v1.0; \
-	sudo install Library/* $(MERLIN_LIB) )
-
-Merlin32_v1.0/Source/Merlin32: Merlin32_v1.0
-	( cd Merlin32_v1.0/Source; \
-	make -f linux_makefile )
-
-Merlin32_v1.0: Merlin32_v1.0.zip
-	unzip Merlin32_v1.0.zip
-	
-Merlin32_v1.0.zip:
-	if java -jar jget.jar $(MERLIN_URL); then \
-		echo Download successful; \
-	else \
-		jget.jar failed. Retrying with curl.; \
-		curl --remote-name $(MERLIN_URL); \
-	fi
+$(PGM): $(SRC)
+	$(MERLIN) $(SRC)
 
 clean:
 	$(RM) $(DSK) $(PGM) *.zip _FileInformation.txt
-	$(RM) -r Merlin32_v1.0 
 
 test: $(DSK)
 	$(APPLEWIN) -d1 $(DSK)