diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d4dc470953..6d4a9af708 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-30  Yao Qi  <yao@codesourcery.com>
+
+	* python/lib/gdb/command/prompt.py (before_prompt_hook): Don't
+	replace '\\' with '\\\\'.
+
 2014-10-29  Joel Brobecker  <brobecker@adacore.com>
 
 	GDB 7.8.1 released.
diff --git a/gdb/python/lib/gdb/command/prompt.py b/gdb/python/lib/gdb/command/prompt.py
index e7dc3daa24..5e973e4b6e 100644
--- a/gdb/python/lib/gdb/command/prompt.py
+++ b/gdb/python/lib/gdb/command/prompt.py
@@ -58,8 +58,7 @@ The currently defined substitutions are:
 
     def before_prompt_hook(self, current):
         if self.value is not '':
-            newprompt = gdb.prompt.substitute_prompt(self.value)
-            return newprompt.replace('\\', '\\\\')
+            return gdb.prompt.substitute_prompt(self.value)
         else:
             return None