diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ef341fad..c3df73766 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,12 @@
 2009-08-18  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-emphasis-regexp-components): Add "`" to set of
+	pre-emphasis characters.
+
 	* org-latex.el (org-export-latex-classes): Always include the soul
 	package.
 	(org-export-latex-emphasis-alist): Use \st for strikethough.
+	(org-export-latex-fontify): Fix emphasis in quotes.
 
 	* org-exp-blocks.el (org-export-blocks-preprocess): Use
 	`indent-code-rigidly' to indent.
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 4e51b6346..40eb8188b 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -1434,7 +1434,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
       (unless emph
 	(message "`org-export-latex-emphasis-alist' has no entry for formatting triggered by \"%s\""
 		 (match-string 3)))
-      (unless (or (get-text-property (1- (point)) 'org-protected)
+      (unless (or (get-text-property (- (point) 3) 'org-protected)
 		  (save-excursion
 		    (goto-char (match-beginning 1))
 		    (save-match-data
diff --git a/lisp/org.el b/lisp/org.el
index 255567efa..2e63f5340 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -2779,7 +2779,7 @@ org-leve-* faces."
 		    "\\([" post  "]\\|$\\)")))))
 
 (defcustom org-emphasis-regexp-components
-  '(" \t('\"{" "- \t.,:!?;'\")}\\" " \t\r\n,\"'" "." 1)
+  '(" \t('`\"{" "- \t.,:!?;'\")}\\" " \t\r\n,\"'" "." 1)
   "Components used to build the regular expression for emphasis.
 This is a list with 6 entries.  Terminology:  In an emphasis string
 like \" *strong word* \", we call the initial space PREMATCH, the final