diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 871d8dd89..a29845257 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-29  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-footnote.el (org-footnote-normalize): Protect replacement
+	text.
+
+	* org.el (org-inside-latex-macro-p): Save match data.
+
 2009-11-27  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-latex.el (org-export-latex-class-options): New variable.
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index b2c29da8c..9dfc4060b 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -398,7 +398,7 @@ referenced sequence."
 		   (skip-chars-backward " \t\n\t")
 		   (delete-region (1+ (point)) (match-beginning 0))))))
 	   (unless sort-only
-	     (replace-match (concat before "[" marker "]"))
+	     (replace-match (concat before "[" marker "]") t t)
 	     (and idef
 		  org-footnote-fill-after-inline-note-extraction
 		  (fill-paragraph)))
diff --git a/lisp/org.el b/lisp/org.el
index 5616c5e71..b37428c14 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14485,8 +14485,9 @@ looks only before point, not after."
 
 (defun org-inside-latex-macro-p ()
   "Is point inside a LaTeX macro or its arguments?"
-  (org-in-regexp
-   "\\\\[a-zA-Z]+\\*?\\(\\[[^][\n{}]*\\]\\)?\\({[^{}\n]*}\\)?"))
+  (save-match-data
+    (org-in-regexp
+     "\\\\[a-zA-Z]+\\*?\\(\\[[^][\n{}]*\\]\\)?\\({[^{}\n]*}\\)?")))
 
 (defun org-try-cdlatex-tab ()
   "Check if it makes sense to execute `cdlatex-tab', and do it if yes.