diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index f0e41b97d..dc97cdfa5 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1744,6 +1744,8 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
       (unless (or (and (get-text-property (- (point) 2) 'org-protected)
 		       (not (get-text-property
 			     (- (point) 2) 'org-verbatim-emph)))
+		  (equal (char-after (match-beginning 3))
+			 (char-after (1+ (match-beginning 3))))
 		  (save-excursion
 		    (goto-char (match-beginning 1))
 		    (save-match-data
diff --git a/lisp/org.el b/lisp/org.el
index 4b7791d72..ad1f15000 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3285,6 +3285,7 @@ example *bold*, _underlined_ and /italic/.  This variable sets the marker
 characters, the face to be used by font-lock for highlighting in Org-mode
 Emacs buffers, and the HTML tags to be used for this.
 For LaTeX export, see the variable `org-export-latex-emphasis-alist'.
+For DocBook export, see the variable `org-export-docbook-emphasis-alist'.
 Use customize to modify this, or restart Emacs after changing it."
   :group 'org-appearance
   :set 'org-set-emph-re