diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cf5e0f54c9..4c5169496e9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-11  Grégoire Jadi  <daimrod@gmail.com>
+
+	* leim/quail/latin-post.el: Transform " __" into " _".  (Bug#18023)
+
 2014-08-10  Ulf Jasper  <ulf.jasper@web.de>
 
 	Enumerate evaluated sexp diary entries (Bug#7911).
diff --git a/lisp/leim/quail/latin-post.el b/lisp/leim/quail/latin-post.el
index c72c459fde0..a4bb85eca69 100644
--- a/lisp/leim/quail/latin-post.el
+++ b/lisp/leim/quail/latin-post.el
@@ -2299,6 +2299,7 @@ Doubling the postfix separates the letter and postfix: e.g. a'' -> a'
  ("z." ?ż)
  ("z~" ?ž)
 
+ (" __" [" _"])
  ("!//" ["!/"])
  ("///" ["//"])
  ("<<<" ["<<"])