diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61010335e..bbbb30c68 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-30  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-footnote.el (org-footnote-normalize): When only dorting, do
+	not insert inline notes at the end.
+
 	* org-docbook.el (org-id-find-id-file): Add function declaration.
 
 	* org.el (org-require-autoloaded-modules): Add org-docbook.el.
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index 67aafd376..73e9c3456 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -362,7 +362,7 @@ referenced sequence."
 	   (and idef
 		org-footnote-fill-after-inline-note-extraction
 		(fill-paragraph)))
-	 (if (not a) (push (list ref marker def) ref-table))))
+	 (if (not a) (push (list ref marker def (if idef t nil)) ref-table))))
       
       ;; First find and remove the footnote section
       (goto-char (point-min))
@@ -402,11 +402,12 @@ referenced sequence."
       (goto-char (or ins-point (point-max)))
       (setq ref-table (reverse ref-table))
       (when sort-only
-	;; remove anonymous fotnotes from the list
+	;; remove anonymous and inline footnotes from the list
 	(setq ref-table
 	      (delq nil (mapcar
 			 (lambda (x) (and (car x)
 					  (not (equal (car x) "fn:"))
+					  (not (nth 3 x))
 					  x))
 			 ref-table))))
       ;; Make sure each footnote has a description, or an error message.