diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7568de701..2593b6141 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,14 @@
 2009-03-08  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-export-latex.el (org-export-latex-preprocess): Make all
+	external preprocess functions use a PARAMETER arg.
+
 	* org-exp.el (org-export-preprocess-string)
 	(org-export-select-backend-specific-text)
 	(org-export-format-source-code-or-example)
 	(org-format-org-table-html): Support docbook export.
+	(org-export-preprocess-string): Make all external preprocess
+	functions use a PARAMETER arg.
 
 2009-03-07  Carsten Dominik  <carsten.dominik@gmail.com>
 
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index a05aeed04..6f1b2a884 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -31,8 +31,8 @@
 (eval-and-compile
   (require 'cl))
 
-(declare-function org-export-latex-preprocess "org-export-latex" ())
-(declare-function org-export-docbook-preprocess "org-export-docbook" ())
+(declare-function org-export-latex-preprocess "org-export-latex" (parameters))
+(declare-function org-export-docbook-preprocess "org-export-docbook" (parameters))
 (declare-function org-agenda-skip "org-agenda" ())
 (declare-function org-infojs-options-inbuffer-template "org-jsinfo" ())
 (declare-function htmlize-region "ext:htmlize" (beg end))
@@ -1672,7 +1672,7 @@ on this string to produce the exported version."
       ;; LaTeX-specific preprocessing
       (when latexp
 	(require 'org-export-latex nil)
-	(org-export-latex-preprocess))
+	(org-export-latex-preprocess parameters))
 
       ;; ASCII-specific preprocessing
       (when asciip
@@ -1684,6 +1684,7 @@ on this string to produce the exported version."
 
       ;; DocBook-specific preprocessing
       (when docbookp
+	(require 'org-export-docbook nil)
         (org-export-docbook-preprocess parameters))
 
       ;; Remove or replace comments
diff --git a/lisp/org-export-latex.el b/lisp/org-export-latex.el
index e77944535..03eeb2dcb 100644
--- a/lisp/org-export-latex.el
+++ b/lisp/org-export-latex.el
@@ -1288,7 +1288,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 (defvar org-latex-entities)   ; defined below
 (defvar org-latex-entities-regexp)   ; defined below
 
-(defun org-export-latex-preprocess ()
+(defun org-export-latex-preprocess (parameters)
   "Clean stuff in the LaTeX export."
   ;; Preserve line breaks
   (goto-char (point-min))