diff --git a/CHANGES.txt b/CHANGES.txt
index 4911d6839fd..c307d99b268 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -897,6 +897,8 @@ Release 0.21.0 - Unreleased
                (Lars Francke via Stack)
    HBASE-2942  Custom filters should not require registration in 
                HBaseObjectWritable (Gary Helmling via Andrew Purtell)
+   HBASE-2976  Running HFile tool passing fully-qualified filename I get
+               'IllegalArgumentException: Wrong FS'
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts
diff --git a/src/docbkx/book.xml b/src/docbkx/book.xml
index 94198aeb239..afecfbb6e08 100644
--- a/src/docbkx/book.xml
+++ b/src/docbkx/book.xml
@@ -32,6 +32,38 @@
       <para>First...</para>
     </section>
   </chapter>
+  <chapter xml:id="filesystem">
+    <title>Filesystem Format</title>
+    <subtitle>How HBase persists to the target Filesystem</subtitle>
+
+    <section>
+      <title>HFile</title>
+    <section>
+      <title>HFile Tool</title>
+      <para>To view a textualized version of hfile content, you can do use
+      the
+      <classname>org.apache.hadoop.hbase.io.hfile.HFile
+      </classname>
+      tool.  Type the following to see usage:
+     <code>
+       $ ${HBASE_HOME}/bin/hbase org.apache.hadoop.hbase.io.hfile.HFile
+     </code>
+     For example, to view the content of the file
+     <filename>hdfs://10.81.47.41:9000/hbase/TEST/1418428042/DSMP/4759508618286845475
+     </filename>,  type the following:
+     <code>
+     $ ${HBASE_HOME}/bin/hbase org.apache.hadoop.hbase.io.hfile.HFile -v -f
+hdfs://10.81.47.41:9000/hbase/TEST/1418428042/DSMP/4759508618286845475
+     </code>
+     If you leave off the option -v to see just a summary on the hfile.
+     See usage for other things to do with the <classname>HFile</classname> tool.
+      </para>
+
+
+    </section>
+
+    </section>
+  </chapter>
 
   <chapter>
     <title>Regions</title>
diff --git a/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java b/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java
index 65cbb9d01c8..3966108f8c2 100644
--- a/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java
+++ b/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java
@@ -1826,6 +1826,8 @@ public class HFile {
       Configuration conf = HBaseConfiguration.create();
       conf.set("fs.defaultFS",
         conf.get(org.apache.hadoop.hbase.HConstants.HBASE_DIR));
+      conf.set("fs.default.name",
+        conf.get(org.apache.hadoop.hbase.HConstants.HBASE_DIR));
       FileSystem fs = FileSystem.get(conf);
       ArrayList<Path> files = new ArrayList<Path>();
       if (cmd.hasOption("f")) {