diff --git a/.gitignore b/.gitignore
index e54c32e9..ff0adf6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,21 @@ Source/ZPM3/gencpm.com
 Source/ZPM3/gencpm.dat
 
 Tools/Linux
-Tools/unix
+Tools/Darwin
+
+Tools/unix/bin2asm/bin2asm
+Tools/unix/cpmtools/cpmchattr
+Tools/unix/cpmtools/cpmchmod
+Tools/unix/cpmtools/cpmcp
+Tools/unix/cpmtools/cpmls
+Tools/unix/cpmtools/cpmrm
+Tools/unix/cpmtools/fsck.cpm
+Tools/unix/cpmtools/fsed.cpm
+Tools/unix/cpmtools/mkfs.cpm
+Tools/unix/lzsa/lzsa
+Tools/unix/uz80as/uz80as
+Tools/unix/zx/config.h
+Tools/unix/zx/zx
 
 !Source/Apps/FAT/FAT.COM
 !Source/BPBIOS/bpbuild.com
diff --git a/Source/Images/diskdefs b/Source/Images/diskdefs
index 5ba6b05b..937bfcf2 100644
--- a/Source/Images/diskdefs
+++ b/Source/Images/diskdefs
@@ -332,8 +332,7 @@ diskdef wbw_hd0
   maxdir 512
   skew 0
   boottrk 1
-  # os 2.2
-  os 3
+  os 2.2
 end
 
 diskdef wbw_hd1
@@ -390,8 +389,7 @@ diskdef wbw_fd144
   maxdir 256
   skew 0
   boottrk 2
-  # os 2.2
-  os 3
+  os 2.2
 end
 
 # RomWBW 360K floppy media
diff --git a/Tools/cpmtools/cpmchattr.exe b/Tools/cpmtools/cpmchattr.exe
index 61a01932..f9d5e044 100644
Binary files a/Tools/cpmtools/cpmchattr.exe and b/Tools/cpmtools/cpmchattr.exe differ
diff --git a/Tools/cpmtools/cpmchmod.exe b/Tools/cpmtools/cpmchmod.exe
index 65db9af7..2e23a271 100644
Binary files a/Tools/cpmtools/cpmchmod.exe and b/Tools/cpmtools/cpmchmod.exe differ
diff --git a/Tools/cpmtools/cpmcp.exe b/Tools/cpmtools/cpmcp.exe
index 21c4f9ea..56d401d8 100644
Binary files a/Tools/cpmtools/cpmcp.exe and b/Tools/cpmtools/cpmcp.exe differ
diff --git a/Tools/cpmtools/cpmls.exe b/Tools/cpmtools/cpmls.exe
index c779134c..960b1773 100644
Binary files a/Tools/cpmtools/cpmls.exe and b/Tools/cpmtools/cpmls.exe differ
diff --git a/Tools/cpmtools/cpmrm.exe b/Tools/cpmtools/cpmrm.exe
index c44d68db..0a2bba1c 100644
Binary files a/Tools/cpmtools/cpmrm.exe and b/Tools/cpmtools/cpmrm.exe differ
diff --git a/Tools/cpmtools/fsck.cpm.exe b/Tools/cpmtools/fsck.cpm.exe
index eceeec9a..3e3d9f47 100644
Binary files a/Tools/cpmtools/fsck.cpm.exe and b/Tools/cpmtools/fsck.cpm.exe differ
diff --git a/Tools/cpmtools/fsed.cpm.exe b/Tools/cpmtools/fsed.cpm.exe
index 2cc97245..c763385c 100644
Binary files a/Tools/cpmtools/fsed.cpm.exe and b/Tools/cpmtools/fsed.cpm.exe differ
diff --git a/Tools/cpmtools/mkfs.cpm.exe b/Tools/cpmtools/mkfs.cpm.exe
index f8ac9b96..e878d4a1 100644
Binary files a/Tools/cpmtools/mkfs.cpm.exe and b/Tools/cpmtools/mkfs.cpm.exe differ