diff --git a/Source/Fonts/Build.cmd b/Source/Fonts/Build.cmd
index f6524c3d..cec086aa 100644
--- a/Source/Fonts/Build.cmd
+++ b/Source/Fonts/Build.cmd
@@ -1,10 +1,12 @@
 @echo off
 setlocal
 
-set HBIOS=..\..\Source\HBIOS
+set TOOLS=../../Tools
+
+set PATH=%TOOLS%\lzsa;%TOOLS%\fonttool;%PATH%
 
 echo.
-echo Compressing and copying fonts...
+echo Preparing compressed font files...
 
 lzsa -f2 -r font8x8u.bin font8x8c.bin
 lzsa -f2 -r font8x11u.bin font8x11c.bin
@@ -16,6 +18,3 @@ fonttool font8x16u.bin > font8x16u.asm
 fonttool font8x8c.bin > font8x8c.asm
 fonttool font8x11c.bin > font8x11c.asm
 fonttool font8x16c.bin > font8x16c.asm
-
-goto :eof
-
diff --git a/Source/Fonts/lzsa.exe b/Source/Fonts/lzsa.exe
deleted file mode 100644
index 74214d13..00000000
Binary files a/Source/Fonts/lzsa.exe and /dev/null differ
diff --git a/Source/Fonts/fonttool.exe b/Tools/fonttool/fonttool.exe
similarity index 100%
rename from Source/Fonts/fonttool.exe
rename to Tools/fonttool/fonttool.exe
diff --git a/Tools/lzsa/ReadMe.txt b/Tools/lzsa/ReadMe.txt
new file mode 100644
index 00000000..5238957e
--- /dev/null
+++ b/Tools/lzsa/ReadMe.txt
@@ -0,0 +1,16 @@
+Command line compressor by Emmanuel Marty
+The compression is done as follows:
+
+lzsa.exe -f2 -r <sourcefile> <outfile>
+
+where option -f2 selects lzsa version 2 compression.
+where option -r asks for the generation of raw (frame-less) data.
+
+Original compression source code and files available here:
+
+Latest github code:
+ https://github.com/emmanuel-marty/lzsa
+Implementation example (older version):
+ https://cpcrulez.fr/applications_tools_cruncher_LZSA2_Z80.htm
+x86 lzsa compressor application:
+ http://www.pouet.net/prod.php?which=81573
\ No newline at end of file
diff --git a/Tools/lzsa/lzsa.exe b/Tools/lzsa/lzsa.exe
new file mode 100644
index 00000000..1c1927d7
Binary files /dev/null and b/Tools/lzsa/lzsa.exe differ