diff --git a/ChangeLog b/ChangeLog
index 33c05680f..a11455b93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-20  Mikael Magnusson  <mikachu@gmail.com>
+
+	* 37161: Src/init.c: Disable the heuristic setting RPROMPT_INDENT
+	to 0
+
 2015-11-20  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 37170: Functions/Zle/smart-insert-last-word: suppress
diff --git a/Src/init.c b/Src/init.c
index 22db4b3b2..dcce1d7ce 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -790,8 +790,10 @@ init_term(void)
 	    tcstr[TCCLEARSCREEN] = ztrdup("\14");
 	    tclen[TCCLEARSCREEN] = 1;
 	}
-	/* This might work, but there may be more to it */
-	rprompt_indent = ((hasam && !hasbw) || hasye || !tccan(TCLEFT));
+	rprompt_indent = 1;
+	/* The following is an attempt at a heuristic,
+	 * but it fails in some cases */
+	/* rprompt_indent = ((hasam && !hasbw) || hasye || !tccan(TCLEFT)); */
     }
     return 1;
 }