diff --git a/CHANGES.txt b/CHANGES.txt
index 4755b7beeba..3cf2688e456 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -41,6 +41,7 @@ Trunk (unreleased changes)
     HADOOP-2157 Make Scanners implement Iterable
     HADOOP-2176 Htable.deleteAll documentation is ambiguous
     HADOOP-2139 (phase 1) Increase parallelism in region servers.
+    HADOOP-2267 [Hbase Shell] Change the prompt's title from 'hbase' to 'hql'.
 
 Release 0.15.1
 Branch 0.15
diff --git a/src/java/org/apache/hadoop/hbase/Shell.java b/src/java/org/apache/hadoop/hbase/Shell.java
index ed47f9543f1..6db38e36520 100644
--- a/src/java/org/apache/hadoop/hbase/Shell.java
+++ b/src/java/org/apache/hadoop/hbase/Shell.java
@@ -25,7 +25,6 @@ import java.io.Writer;
 
 import jline.ConsoleReader;
 
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.shell.Command;
 import org.apache.hadoop.hbase.shell.HelpCommand;
 import org.apache.hadoop.hbase.shell.ReturnMsg;
@@ -43,7 +42,6 @@ public class Shell {
   /** audible keyboard bells */
   public static final boolean DEFAULT_BELL_ENABLED = true;
   
-
   /** Return the boolean value indicating whether end of command or not */
   static boolean isEndOfCommand(String line) {
     return (line.lastIndexOf(';') > -1) ? true : false;
@@ -51,7 +49,7 @@ public class Shell {
 
   /** Return the string of prompt start string */
   private static String getPrompt(final StringBuilder queryStr) {
-    return (queryStr.toString().equals("")) ? "Hbase> " : "   --> ";
+    return (queryStr.toString().equals("")) ? "hql > " : "  --> ";
   }
 
   /**