diff --git a/CHANGES.txt b/CHANGES.txt
index 415de1e6a5b..02fd9c513e3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -649,6 +649,7 @@ Release 0.21.0 - Unreleased
    HBASE-2613  Remove the code around MSG_CALL_SERVER_STARTUP
    HBASE-2599  BaseScanner says "Current assignment of X is not valid" over
                and over for same region
+   HBASE-2630  HFile should use toStringBinary in various places
 
   NEW FEATURES
    HBASE-1961  HBase EC2 scripts
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 ab8b74e2e05..b912a85f0ae 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
@@ -569,8 +569,8 @@ public class HFile {
             this.lastKeyLength, key, offset, length);
         if (keyComp > 0) {
           throw new IOException("Added a key not lexically larger than" +
-            " previous key=" + Bytes.toString(key, offset, length) +
-            ", lastkey=" + Bytes.toString(this.lastKeyBuffer, this.lastKeyOffset,
+            " previous key=" + Bytes.toStringBinary(key, offset, length) +
+            ", lastkey=" + Bytes.toStringBinary(this.lastKeyBuffer, this.lastKeyOffset,
                 this.lastKeyLength));
         } else if (keyComp == 0) {
           dupKey = true;
@@ -1625,7 +1625,7 @@ public class HFile {
       sb.append("size=" + count);
       for (int i = 0; i < count ; i++) {
         sb.append(", ");
-        sb.append("key=").append(Bytes.toString(blockKeys[i])).
+        sb.append("key=").append(Bytes.toStringBinary(blockKeys[i])).
           append(", offset=").append(blockOffsets[i]).
           append(", dataSize=" + blockDataSizes[i]);
       }