diff --git a/src/bin/Makefile b/src/bin/Makefile
index 862a86b..be42b9e 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
+all: init-bin login-bin shell-bin ls-bin clock-bin cp-bin fdisk-bin format-bin disklabel-bin
 # test-bin pwd-bin cat-bin ld-dyn-bin de-bin goofball-bin
 
 init-bin: init 
@@ -49,6 +49,9 @@
 format-bin: format
 	(cd format;make)
 
+disklabel-bin: disklabel
+	(cd disklabel;make)
+
 clean:
 	(cd cp;make clean)
 	(cd fdisk;make clean)
@@ -59,3 +62,4 @@
 	(cd clock;make clean)
 	(cd muffin;make clean)
 	(cd format;make clean)
+	(cd disklabel;make clean)
diff --git a/src/bin/disklabel/Makefile b/src/bin/disklabel/Makefile
new file mode 100644
index 0000000..360c33b
--- /dev/null
+++ b/src/bin/disklabel/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 = disklabel 
+
+#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/disklabel/main.c b/src/bin/disklabel/main.c
new file mode 100644
index 0000000..d873d15
--- /dev/null
+++ b/src/bin/disklabel/main.c
@@ -0,0 +1,98 @@
+/**************************************************************************************
+ 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.
+
+ $Id$
+
+**************************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/sys.h>
+#include <string.h>
+
+#include "ubixfs.h"
+
+  
+int main(int argc,char **argv) {
+  FILE *fd;
+  struct ubixDiskLabel *d = (struct ubixDiskLabel *)malloc(512);
+  int i = 0x0;
+  char buf[256];
+
+  printf("Ubix Disk Label Editor Version 1.0\n");
+  printf("(c) 2004 Ubix Corp              \n\n");
+ 
+  if (argc >= 2) {
+    printf("Drive Info (%s):\n",argv[1]);
+    fd = fopen(argv[1],"rb");
+    }
+  else {
+    printf("Drive Info (hd0):\n");
+    fd = fopen("hd0@devfs","rb");
+    }
+  fseek(fd,512,0);
+  fread(d,512,1,fd);
+
+  if (argc >= 3) {
+    i = atoi(argv[2]);
+    printf("d->partitions[%i].p_size   = %i, ",i,d->partitions[i].p_size);
+    printf("New Value: ");
+    gets(&buf);
+    d->partitions[i].p_size = atoi(buf);
+    printf("d->partitions[%i].p_offset = %i, ",i,d->partitions[i].p_offset);
+    printf("New Value: ");
+    gets(&buf);
+    d->partitions[i].p_offset = atoi(buf);
+    printf("d->partitions[%i].p_fstype = %i, ",i,d->partitions[i].p_fstype);
+    printf("New Value: ");
+    gets(&buf);
+    d->partitions[i].p_fstype = atoi(buf);
+    printf("d->partitions[%i].p_bsize  = %i, ",i,d->partitions[i].p_bsize);
+    printf("New Value: ");
+    gets(&buf);
+    d->partitions[i].p_bsize = atoi(buf);
+    printf("\n");
+    printf("d->partitions[%i].p_size   = %i\n",i,d->partitions[i].p_size);
+    printf("d->partitions[%i].p_offset = %i\n",i,d->partitions[i].p_offset);
+    printf("d->partitions[%i].p_fstype = %i\n",i,d->partitions[i].p_fstype);
+    printf("d->partitions[%i].p_bsize  = %i\n",i,d->partitions[i].p_bsize);
+    fseek(fd,512,0);
+    fwrite(d,512,1,fd);
+    }
+  else {
+    for (i=0;i<4;i++) {
+      if (d->partitions[i].p_fstype != 0x0) {
+        printf("d->partitions[%i].p_size   = %i\n",i,d->partitions[i].p_size);
+        printf("d->partitions[%i].p_offset = %i\n",i,d->partitions[i].p_offset);
+        printf("d->partitions[%i].p_fstype = 0x%X\n",i,d->partitions[i].p_fstype);
+        printf("d->partitions[%i].p_bsize  = 0x%X\n",i,d->partitions[i].p_bsize);
+        }
+      }
+    }
+
+  fclose(fd);
+
+  exit(0);
+  }
+
+/***
+ END
+ ***/
+
diff --git a/src/bin/disklabel/ubixfs.h b/src/bin/disklabel/ubixfs.h
new file mode 100644
index 0000000..218d9ec
--- /dev/null
+++ b/src/bin/disklabel/ubixfs.h
@@ -0,0 +1,42 @@
+#include <sys/types.h>
+
+#define	DOSPTYP_UBX	 0x2A	/* UbixFS partition type */
+#define UBIXDISKMAGIC    ((uInt32)0x45) /* The disk magic number */
+#define MAXUBIXPARTITIONS 16
+#define UBIXFSMAGIC      ((uInt32)0x69) /* The File System Magic Number */
+
+struct ubixDiskLabel {
+  uInt32 magicNum;
+  uInt32 magicNum2;
+  uInt16 driveType;
+  uInt16 numPartitions;
+  struct  ubixPartitions {             /* the partition table */
+    uInt32 p_size;       /* number of sectors in partition */
+    uInt32 p_offset;     /* starting sector */
+    uInt32 p_fsize;      /* filesystem basic fragment size */
+    uInt32 p_bsize;      /* BAT size */
+    uInt8 p_fstype;      /* filesystem type, see below */
+    uInt8 p_frag;        /* filesystem fragments per block */
+        } partitions[MAXUBIXPARTITIONS];
+  };
+
+//Block Allocation Table Entry
+struct blockAllocationTableEntry {
+  long attributes; //Block Attributes
+  long realSector; //Real Sector  
+  long nextBlock;  //Sector Of Next Block
+  long reserved;   //Reserved
+  };
+
+
+struct directoryEntry {
+  uLong  startCluster;   //Starting Cluster Of File
+  uLong  size;           //Size Of File
+  uLong  creationDate;  //Date Created
+  uLong  lastModified;  //Date Last Modified
+  uLong  uid;           //UID Of Owner
+  uLong  gid;           //GID Of Owner
+  uShort attributes;    //Files Attributes
+  uShort permissions;   //Files Permissions
+  char   fileName[256]; //File Name
+  };
diff --git a/src/bin/fdisk/main.c b/src/bin/fdisk/main.c
index 6476eae..4342aab 100644
--- a/src/bin/fdisk/main.c
+++ b/src/bin/fdisk/main.c
@@ -47,7 +47,7 @@
     printf("Drive Info (hd0):\n");
     fd = fopen("hd0@devfs","rb");
     }
-  fseek(fd,512,0);
+  fseek(fd,0,0);
   fread(d,512,1,fd);
 
   if (argc >= 3) {
@@ -73,7 +73,7 @@
     printf("d->partitions[%i].p_offset = %i\n",i,d->partitions[i].p_offset);
     printf("d->partitions[%i].p_fstype = %i\n",i,d->partitions[i].p_fstype);
     printf("d->partitions[%i].p_bsize  = %i\n",i,d->partitions[i].p_bsize);
-    fseek(fd,512,0);
+    fseek(fd,0,0);
     fwrite(d,512,1,fd);
     }
   else {