diff --git a/CHANGES.txt b/CHANGES.txt
index 37705ebba5c..1346ad9df00 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,7 +21,8 @@ Hbase Change Log
    HBASE-434, HBASE-435 TestTableIndex and TestTableMapReduce failed in Hudson builds
    HBASE-446   Fully qualified hbase.rootdir doesn't work
    HBASE-438   XMLOutputter state should be initialized. (Edward Yoon via Stack)
-
+   HBASE-8     Delete table does not remove the table directory in the FS
+   
   IMPROVEMENTS
    HBASE-415   Rewrite leases to use DelayedBlockingQueue instead of polling
    HBASE-35    Make BatchUpdate public in the API
diff --git a/src/java/org/apache/hadoop/hbase/master/TableDelete.java b/src/java/org/apache/hadoop/hbase/master/TableDelete.java
index f51f8a3dfb5..cc0639224b9 100644
--- a/src/java/org/apache/hadoop/hbase/master/TableDelete.java
+++ b/src/java/org/apache/hadoop/hbase/master/TableDelete.java
@@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.master;
 import java.io.IOException;
 import java.util.HashSet;
 
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HRegion;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HRegionInterface;
@@ -62,6 +63,9 @@ class TableDelete extends ChangeTableState {
       }
     }
     super.postProcessMeta(m, server);
+    
+    // delete the table's folder from fs.
+    master.fs.delete(new Path(master.rootdir, tableName.toString()));
   }
 
   @Override