diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00da55a24fe4a232558f0898a063dce02653b16b..7bb7c4c3c1ce4994b088d492cee4bdf8d8da2055 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* textmodes/tex-mode.el (tex-insert-quote): ~ is a space (bug#12137).
+
 2012-08-15  Wolfgang Jenkner  <wjenkner@inode.at>
 
 	* man.el (Man-overstrike-face, Man-underline-face)
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 9a3462773fc2b2139bdf654e5d6befe7451f8b83..957003ca2e0392fd4ada08a6626e8c7a196f445e 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1286,7 +1286,8 @@ inserts \" characters."
 	      (delete-char (length tex-open-quote))
 	      t)))
       (self-insert-command (prefix-numeric-value arg))
-    (insert (if (memq (char-syntax (preceding-char)) '(?\( ?> ?\s))
+    (insert (if (or (memq (char-syntax (preceding-char)) '(?\( ?> ?\s))
+                    (memq (preceding-char) '(?~)))
 		tex-open-quote tex-close-quote))))
 
 (defun tex-validate-buffer ()