diff --git a/CHANGES.txt b/CHANGES.txt
index d09229d9df2..1c6bf990e05 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -50,6 +50,8 @@ Trunk (unreleased changes)
    HADOOP-2309 ConcurrentModificationException doing get of all region start keys
    HADOOP-2321 TestScanner2 does not release resources which sometimes cause the
                test to time out
+   HADOOP-2315 REST servlet doesn't treat / characters in row key correctly
+               (Bryan Duxbury via Stack)
 
   IMPROVEMENTS
    HADOOP-2401 Add convenience put method that takes writable
diff --git a/src/java/org/apache/hadoop/hbase/rest/Dispatcher.java b/src/java/org/apache/hadoop/hbase/rest/Dispatcher.java
index 47ded9361ef..4783757c726 100644
--- a/src/java/org/apache/hadoop/hbase/rest/Dispatcher.java
+++ b/src/java/org/apache/hadoop/hbase/rest/Dispatcher.java
@@ -157,6 +157,7 @@ implements javax.servlet.Servlet {
    * element in pathSegment is not the empty string.
    */
   private String [] getPathSegments(final HttpServletRequest request) {
-    return request.getPathInfo().substring(1).split("/");
+    int context_len = request.getContextPath().length() + 1;
+    return request.getRequestURI().substring(context_len).split("/");
   }
-}
\ No newline at end of file
+}