diff --git a/src/bin/Makefile b/src/bin/Makefile
index f0c6b9b..1eb54d8 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 muffin-bin cp-bin fdisk-bin
+all: init-bin login-bin shell-bin ls-bin clock-bin muffin-bin cp-bin fdisk-bin format-bin
 # test-bin pwd-bin cat-bin ld-dyn-bin de-bin goofball-bin
 
 init-bin: init 
@@ -46,18 +46,16 @@
 cp-bin: cp
 	(cd cp;make)
 
+format-bin: format
+	(cd format;make)
+
 clean:
 	(cd cp;make clean)
 	(cd fdisk;make clean)
 	(cd init;make clean)
 	(cd shell;make clean)
-	#(cd test;make clean)
 	(cd ls;make clean)
-	#(cd pwd;make clean)
 	(cd login;make clean)
 	(cd clock;make clean)
-	#(cd cat;make clean)
-	#(cd ld-dyn;make clean)
-	#(cd de;make clean)
 	(cd muffin;make clean)
-	#(cd goofball;make clean)
+	(cd format;make clean)
diff --git a/src/bin/format/Makefile b/src/bin/format/Makefile
new file mode 100644
index 0000000..fa16777
--- /dev/null
+++ b/src/bin/format/Makefile
@@ -0,0 +1,48 @@
+# $Id$
+# Application Makefile (C) 2002 The UbixOS Project
+
+# Include Global 'Source' Options
+include ../../Makefile.inc
+include ../Makefile.inc
+
+#Compiler Flags
+CFLAGS = -I../../include -I../../lib/libc/include -fno-builtin
+
+#Linker
+LD = ld
+
+#Binary File Name
+BINARY = format
+
+#Delete Program
+REMOVE = rm -f
+
+#Objects
+OBJS = main.o
+
+#Startup File
+STARTUP = ../../lib/ubix/startup.o
+
+# Link The Binary
+$(BINARY) : $(OBJS)
+	$(CC) -nostdlib -o $@ $(STARTUP) $(LIBRARIES) $(OBJS)
+
+# Compile the source files
+.cc.o:
+	$(CXX)  -Wall -fomit-frame-pointer -O $(CFLAGS) -c -o $@ $<
+ 
+.cc.s:
+	$(CXX)  -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $<
+ 
+.c.o:
+	$(CC)  -Wall -O $(CFLAGS) -c -o $@ $<
+ 
+.c.s:
+	$(CC)  -Wall -fomit-frame-pointer -O $(CFLAGS) -S -o $@ $<
+ 
+.S.o:
+	$(CC)  -Wall -fomit-frame-pointer -c -o $@ $<
+ 
+# Clean Up The junk
+clean:
+	$(REMOVE) $(OBJS) $(BINARY)
diff --git a/src/bin/format/main.c b/src/bin/format/main.c
new file mode 100644
index 0000000..3860ec0
--- /dev/null
+++ b/src/bin/format/main.c
@@ -0,0 +1,47 @@
+*****************************************************************************************
+ Copyright (c) 2002 The UbixOS Project
+ All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of
+conditions, the following disclaimer and the list of authors.  Redistributions in binary
+form must reproduce the above copyright notice, this list of conditions, the following
+disclaimer and the list of authors in the documentation and/or other materials provided
+with the distribution. Neither the name of the UbixOS Project nor the names of its
+contributors may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ $Log$
+
+ $Id$
+
+*****************************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/sys.h>
+#include <string.h>
+
+  
+int main(int argc,char **argv) {
+  printf("UbixOS Format V1.0\n");
+  exit(0);
+  }
+
+/***
+ END
+ ***/
+