diff --git a/Source/Images/d_bp.txt b/Source/Images/d_bp.txt
index e6ce4a2b..dd4f248c 100644
--- a/Source/Images/d_bp.txt
+++ b/Source/Images/d_bp.txt
@@ -21,6 +21,7 @@
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:
+../../Binary/Apps/tbasic.com 0:
 ../../Binary/Apps/timer.com 15:
 ../../Binary/Apps/tune.com 15:
 ../../Binary/Apps/xm.com 15:
diff --git a/Source/Images/d_cpm3.txt b/Source/Images/d_cpm3.txt
index 036adcf8..da74a74b 100644
--- a/Source/Images/d_cpm3.txt
+++ b/Source/Images/d_cpm3.txt
@@ -33,6 +33,7 @@
 ../../Binary/Apps/syscopy.com 0:
 #../../Binary/Apps/sysgen.com 0:
 #../../Binary/Apps/talk.com 0:
+../../Binary/Apps/tbasic.com 0:
 ../../Binary/Apps/timer.com 0:
 ../../Binary/Apps/tune.com 0:
 ../../Binary/Apps/xm.com 0:
diff --git a/Source/Images/d_nzcom.txt b/Source/Images/d_nzcom.txt
index e9cc1e3f..e0fa9c63 100644
--- a/Source/Images/d_nzcom.txt
+++ b/Source/Images/d_nzcom.txt
@@ -34,6 +34,7 @@ d_zsdos/u0/*.* 0:
 ../../Binary/Apps/syscopy.com 0:
 ../../Binary/Apps/sysgen.com 0:
 ../../Binary/Apps/talk.com 0:
+../../Binary/Apps/tbasic.com 0:
 ../../Binary/Apps/timer.com 0:
 ../../Binary/Apps/tune.com 0:
 ../../Binary/Apps/xm.com 0:
diff --git a/Source/Images/d_zpm3.txt b/Source/Images/d_zpm3.txt
index 8bf0ce43..ebb97155 100644
--- a/Source/Images/d_zpm3.txt
+++ b/Source/Images/d_zpm3.txt
@@ -32,6 +32,7 @@
 ../../Binary/Apps/syscopy.com 15:
 ../../Binary/Apps/sysgen.com 15:
 ../../Binary/Apps/talk.com 15:
+../../Binary/Apps/tbasic.com 0:
 ../../Binary/Apps/timer.com 15:
 ../../Binary/Apps/tune.com 15:
 ../../Binary/Apps/xm.com 15:
diff --git a/Source/TastyBasic/Makefile b/Source/TastyBasic/Makefile
index 267ad065..fced87a1 100644
--- a/Source/TastyBasic/Makefile
+++ b/Source/TastyBasic/Makefile
@@ -1,9 +1,3 @@
-SUBDIRS := src
-TARGETS := all clobber clean
-
-$(TARGETS): $(SUBDIRS)
-
-$(SUBDIRS):
-	$(MAKE) -C $@ $(MAKECMDGOALS)
-
-.PHONY: $(TARGETS) $(SUBDIRS)
+SUBDIRS = src
+TOOLS = ../../Tools
+include $(TOOLS)/Makefile.inc
diff --git a/Source/TastyBasic/src/Makefile b/Source/TastyBasic/src/Makefile
index dbe3fae8..f99949a1 100644
--- a/Source/TastyBasic/src/Makefile
+++ b/Source/TastyBasic/src/Makefile
@@ -1,36 +1,16 @@
-UNAME := $(shell uname)
-# VER := $(shell git describe --tags --abbrev=0)
-APPDIR := $(wildcard ../../../Binary/Apps)
-BINDIR := ../../../Tools/$(UNAME)
+OBJECTS = tastybasic.bin tbasic.com
+TOOLS = ../../../Tools
+OTHERS = *.com
+APPDIR=../../../Binary/Apps
+
+include $(TOOLS)/Makefile.inc
 
-ROMIMAGE := tastybasic.bin
-ROMDEPS := tastybasic.asm romwbwio.asm
-CPMCMD := tastybasic.com
-CPMDEPS := tastybasic.asm cpmio.asm
-CPMAPP := $(APPDIR)/tbasic.com
-CPMIMAGE := tastybasic.img
+USETASM=1
 
-export PATH := $(BINDIR):${PATH}
+tastybasic.bin: TASMFLAGS=-dROMWBW
 
-all: $(ROMIMAGE) $(CPMCMD) | $(APPDIR)
+tastybasic.com: TASMFLAGS=-dCPM
 
-clean:
-	@rm -f *.lst *.img *.com *.bin
-
-clobber: clean
-	@rm -f $(CPMAPP)
-
-$(ROMIMAGE): $(ROMDEPS)
-	@uz80as -dROMWBW tastybasic.asm tastybasic.bin tastybasic.bin.lst
-
-$(CPMIMAGE): $(CPMCMD)
-	@mkfs.cpm -f wbw_fd144 tastybasic.img
-	@cpmcp -f wbw_fd144 tastybasic.img tastybasic.com 0:tbasic.com
-
-$(CPMCMD): $(CPMDEPS)
-	@uz80as -dCPM tastybasic.asm tastybasic.com tastybasic.com.lst
-
-$(APPDIR): $(CPMCMD)
-	@cat $(CPMCMD) > $(CPMAPP)
-
-.PHONY: clean clobber $(APPDIR)
+tbasic.com : tastybasic.com
+	cp $< $@
+	cp $$($(CASEFN) $@) $(APPDIR)
\ No newline at end of file
diff --git a/Source/ver.inc b/Source/ver.inc
index 09a06696..efa020d8 100644
--- a/Source/ver.inc
+++ b/Source/ver.inc
@@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.1.1-pre.134"
+#DEFINE BIOSVER	"3.1.1-pre.135"
diff --git a/Source/ver.lib b/Source/ver.lib
index b86cd056..a927559d 100644
--- a/Source/ver.lib
+++ b/Source/ver.lib
@@ -3,5 +3,5 @@ rmn	equ	1
 rup	equ	1
 rtp	equ	0
 biosver	macro
-	db	"3.1.1-pre.134"
+	db	"3.1.1-pre.135"
 	endm