diff --git a/Makefile b/Makefile
index 88c7700..b6856ea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 # The System Makefile (C) 2002 The UbixOS Project
 
-all: kernel libc_old ubix libcpp bin tools
+all: kernel libc_old ubix libcpp bin sbin tools
 # depend kernel tools
 
 libc_old: src
@@ -22,6 +22,9 @@
 depend: src
 	(cd src/lib/ubix;make)
 
+sbin: src
+	(cd src/sbin;make)
+
 bin: src
 	(cd src/bin;make)
 
@@ -40,6 +43,7 @@
 clean:
 	(cd src/sys;make clean)
 	(cd src/lib/libc_old;make clean)
+	(cd src/sbin;make clean)
 	(cd src/bin;make clean)
 	(cd src/lib/ubix;make clean)
 	(cd src/lib/objgfx40;make clean)
diff --git a/src/bin/Makefile b/src/bin/Makefile
index aeae246..f03aa56 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 # The System Makefile (C) 2002 The UbixOS Project
 
-all: init-bin login-bin shell-bin ls-bin clock-bin cp-bin fdisk-bin format-bin disklabel-bin ubistry-bin edit-bin ld-bin ttyd-bin stat-bin
+all: init-bin login-bin shell-bin ls-bin clock-bin cp-bin edit-bin ld-bin stat-bin
 # test-bin pwd-bin cat-bin de-bin goofball-bin
 
 init-bin: init 
@@ -34,52 +34,30 @@
 muffin-bin: muffin
 	(cd muffin;make)
 
-goofball-bin: goofball
-	(cd goofball;make)
-
 clock-bin: clock
 	(cd clock;make)
 
-fdisk-bin: fdisk
-	(cd fdisk;make)
-
 cp-bin: cp
 	(cd cp;make)
 
-format-bin: format
-	(cd format;make)
-
-disklabel-bin: disklabel
-	(cd disklabel;make)
 
 launcher-bin: launcher
 	(cd launcher;make)
 
-ubistry-bin: ubistry
-	(cd ubistry;make)
-
 edit-bin: edit
 	(cd edit;make)
 
-ttyd-bin: ttyd
-	(cd ttyd;make)
-
 stat-bin: stat
 	(cd stat;make)
 
 clean:
 	(cd cp;make clean)
-	(cd fdisk;make clean)
 	(cd init;make clean)
 	(cd shell;make clean)
 	(cd ls;make clean)
 	(cd login;make clean)
 	(cd clock;make clean)
 	(cd muffin;make clean)
-	(cd format;make clean)
-	(cd disklabel;make clean)
-	(cd ubistry;make clean)
 	(cd ld;make clean)
 	(cd edit;make clean)
-	(cd ttyd;make clean)
 	(cd stat;make clean)
diff --git a/src/sbin/Makefile b/src/sbin/Makefile
new file mode 100755
index 0000000..f1a82ae
--- /dev/null
+++ b/src/sbin/Makefile
@@ -0,0 +1,18 @@
+all: fdisk-bin format-bin disklabel-bin ttyd-bin ubistry-bin
+fdisk-bin: fdisk
+	(cd fdisk;make)
+format-bin: format 
+	(cd format;make)
+disklabel-bin: disklabel
+	(cd disklabel;make)
+ttyd-bin: ttyd
+	(cd ttyd;make)
+ubistry-bin: ubistry
+	(cd ubistry;make)
+clean:
+	(cd fdisk;make clean)
+	(cd format;make clean)
+	(cd ttyd;make clean)
+	(cd disklabel;make clean)
+	(cd ubistry;make clean)
+