diff --git a/.gitignore b/.gitignore
index ae0884e..d1ef35e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 _FileInformation.txt
 afscanner_Output.txt
+afscanner
+dev.po
+afscanner.zip
diff --git a/Makefile b/Makefile
index 2674faa..5b4f4a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,20 @@
+# 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"
 
+# Local stuff:
+PGM = afscanner
+SYS = afscannr.system
+TYPE = SYS
+ADDR = 0x2000
+TMPL = template.po
+DISK = dev.po
 
 
 build:
-	$(ASM) afscanner.s
-	$(AC) -pro140 dev.po DEV
-	cat afscanner | $(AC) -p dev.po afscanner BIN 0x8000
+	$(ASM) $(PGM).s
+	cp $(TMPL) $(DISK)
+	cat $(PGM) | $(AC) -p $(DISK) $(SYS) $(TYPE) $(ADDR)
+	$(AC) -k $(DISK) $(SYS)
+	$(AC) -ll $(DISK)
+	zip $(PGM).zip $(DISK)
diff --git a/afscanner.s b/afscanner.s
index 6e1fa8d..ac7e5a9 100755
--- a/afscanner.s
+++ b/afscanner.s
@@ -9,6 +9,9 @@
 *
 ********************************
 
+	ORG $2000
+	TYP SYS
+
                XC               ; enable 65C02
 
 * Constants:
@@ -81,7 +84,7 @@ MAIN           JSR   $C300      ; Assuming 80 columns
                JSR   PRINT
                DFB   _CLS
                DFB   _INVERSE
-               ASC   " Address Field Scanner 1.0 "
+               ASC   " Address Field Scanner 2.0beta "
                DFB   _NORMAL
                DFB   23,$8D     ; repeat 8D 23x
                DFB   _INVERSE
diff --git a/template.po b/template.po
new file mode 100755
index 0000000..762dcae
Binary files /dev/null and b/template.po differ