diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd59a370b..e574eee58 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-20  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.el (org-refile): Allow refiling to the last entry in the
+	buffer.
+
 2008-09-19  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.el (org-indent-line-function): No longer check for src
diff --git a/lisp/org.el b/lisp/org.el
index 55cdb8b5a..e7a847a0a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7951,10 +7951,11 @@ operation has put the subtree."
 		(setq level (org-get-valid-level (funcall outline-level) 1))
 		(goto-char
 		 (if reversed
-		     (outline-next-heading)
+		     (or (outline-next-heading) (point-max))
 		   (or (save-excursion (outline-get-next-sibling))
 		       (org-end-of-subtree t t)
 		       (point-max))))
+		(if (not (bolp)) (newline))
 		(bookmark-set "org-refile-last-stored")
 		(org-paste-subtree level))))
 	  (org-cut-subtree)