diff --git a/Makefile b/Makefile
index ee866f4..ad14474 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-targets := ns.clock cricket bbb ram.drv
+targets := ns.clock cricket bbb ram.drv quit
 
 .PHONY: all $(targets)
 
diff --git a/bbb/Makefile b/bbb/Makefile
index 0e252e2..d2381c2 100644
--- a/bbb/Makefile
+++ b/bbb/Makefile
@@ -2,7 +2,7 @@
 CAFLAGS = --target apple2enh --list-bytes 0
 LDFLAGS = --config apple2-asm.cfg
 
-TARGETS = bye.system.SYS buhbye.system.SYS quit.system.SYS
+TARGETS = bye.system.SYS buhbye.system.SYS
 
 # For timestamps
 MM = $(shell date "+%-m")
diff --git a/bbb/README.md b/bbb/README.md
index 1b0b308..9a39298 100644
--- a/bbb/README.md
+++ b/bbb/README.md
@@ -60,8 +60,3 @@ next file starting with 'C').
 
 There are a few spare bytes to play with and more can be squeezed
 out, so perhaps further improvements can be made.
-
-## QUIT.SYSTEM
-
-This just invokes the ProDOS quit handler immediately. It can
-be used as the last in a chain of "driver" installers.
diff --git a/quit/Makefile b/quit/Makefile
new file mode 100644
index 0000000..484dac9
--- /dev/null
+++ b/quit/Makefile
@@ -0,0 +1,27 @@
+
+CAFLAGS = --target apple2enh --list-bytes 0
+LDFLAGS = --config apple2-asm.cfg
+
+TARGETS = quit.system.SYS
+
+# For timestamps
+MM = $(shell date "+%-m")
+DD = $(shell date "+%-d")
+YY = $(shell date "+%-y")
+DEFINES = -D DD=$(DD) -D MM=$(MM) -D YY=$(YY)
+
+.PHONY: clean all
+all: $(TARGETS)
+
+HEADERS = $(wildcard *.inc) $(wildcard ../inc/*.inc)
+
+clean:
+	rm -f *.o
+	rm -f $(TARGETS)
+
+%.o: %.s $(HEADERS)
+	ca65 $(CAFLAGS) $(DEFINES) --listing $(basename $@).list -o $@ $<
+
+%.SYS: %.o
+	ld65 $(LDFLAGS) -o $@ $<
+	xattr -wx prodos.AuxType '00 20' $@
diff --git a/quit/README.md b/quit/README.md
new file mode 100644
index 0000000..0d058af
--- /dev/null
+++ b/quit/README.md
@@ -0,0 +1,4 @@
+
+## QUIT.SYSTEM
+
+This just invokes the ProDOS quit handler immediately. It can be used as the last in a chain of "driver" installers to invoke the program selector (e.g. [Bitsy Bye](https://prodos8.com/bitsy-bye/), [Bird's Better Bye](../bbb), etc)
diff --git a/bbb/quit.system.s b/quit/quit.system.s
similarity index 50%
rename from bbb/quit.system.s
rename to quit/quit.system.s
index efb4231..1d1d830 100644
--- a/bbb/quit.system.s
+++ b/quit/quit.system.s
@@ -1,17 +1,11 @@
 
         .setcpu "6502"
         .include "apple2.inc"
-        .include "prodos.inc"
 
-        .org    $2000
+        .include "../inc/apple2.inc"
+        .include "../inc/prodos.inc"
 
-CLR80VID        := $C00C
-ROMIN2          := $C082
-SETVID          := $FE93
-SETKBD          := $FE89
-INIT            := $FB2F
-HOME            := $FC58
-SETNORM         := $FE84
+        .org    SYS_ADDR
 
         cld
         bit     ROMIN2
@@ -27,9 +21,4 @@ SETNORM         := $FE84
         MLI_CALL QUIT, quit_params
         brk
 
-quit_params:
-        .byte   4
-        .byte   0
-        .word   0
-        .byte   0
-        .word   0
+        DEFINE_QUIT_PARAMS quit_params