diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2ca57571c..6ad132f65 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el:  Avoid using `default-major-mode'.
+
+	* org-html.el (org-export-as-html):  Avoid using
+	`default-major-mode'.
+
+	* org-docbook.el (org-export-as-docbook): Avoid using
+	`default-major-mode'.
+
 	* org-plot.el (require): Require CL only at compile time.
 
 	* org-exp.el (require): Require CL only at compile time.
diff --git a/lisp/org-docbook.el b/lisp/org-docbook.el
index 811992970..f0197f725 100644
--- a/lisp/org-docbook.el
+++ b/lisp/org-docbook.el
@@ -1101,7 +1101,7 @@ publishing directory."
 
       (unless (plist-get opt-plist :buffer-will-be-killed)
 	(normal-mode)
-	(if (eq major-mode default-major-mode)
+	(if (eq major-mode (default-value 'major-mode))
 	    (nxml-mode)))
 
       ;; Remove empty paragraphs and lists.  Replace them with a
diff --git a/lisp/org-html.el b/lisp/org-html.el
index d033f7fee..a41433594 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -1420,7 +1420,8 @@ lang=\"%s\" xml:lang=\"%s\">
 
       (unless (plist-get opt-plist :buffer-will-be-killed)
 	(normal-mode)
-	(if (eq major-mode default-major-mode) (html-mode)))
+	(if (eq major-mode (default-value 'major-mode))
+	    (html-mode)))
 
       ;; insert the table of contents
       (goto-char (point-min))
diff --git a/lisp/org.el b/lisp/org.el
index 29e024e85..2633dbe27 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -13690,7 +13690,8 @@ the buffer and restores the previous window configuration."
 	(while (setq b (find-buffer-visiting f)) (kill-buffer b))
 	(with-temp-file f
 	  (insert (mapconcat 'identity list "\n") "\n")))
-    (let ((org-mode-hook nil) (default-major-mode 'fundamental-mode))
+    (let ((org-mode-hook nil) (org-inhibit-startup t)
+	  (org-insert-mode-line-in-empty-file nil))
       (setq org-agenda-files list)
       (customize-save-variable 'org-agenda-files org-agenda-files))))