diff --git a/contrib/lisp/org-e-html.el b/contrib/lisp/org-e-html.el
index db9651645..3c122273d 100644
--- a/contrib/lisp/org-e-html.el
+++ b/contrib/lisp/org-e-html.el
@@ -114,6 +114,7 @@
 
 (defconst org-e-html-options-alist
   '((:agenda-style nil nil org-agenda-export-html-style)
+    (:creator "CREATOR" nil org-e-html-creator-string)
     (:convert-org-links nil nil org-e-html-link-org-files-as-html)
     ;; (:expand-quoted-html nil "@" org-e-html-expand)
     (:inline-images nil nil org-e-html-inline-images)
@@ -871,6 +872,14 @@ When nil, the links still point to the plain `.org' file."
   :group 'org-export-e-html
   :type 'boolean)
 
+(defcustom org-e-html-creator-string
+  (format "Generated by <a href=\"http://orgmode.org\">Org</a> mode %s in <a href=\"http://www.gnu.org/software/emacs/\">Emacs</a> %s."
+	  (if (fboundp 'org-version) (org-version) "(Unknown)")
+	  emacs-version)
+  "String to insert at the end of the HTML document."
+  :group 'org-export-e-html
+  :type '(string :tag "Creator string"))
+
 ;;;; Headline
 
 (defcustom org-e-html-format-headline-function nil
diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el
index 9700b8f43..6a2ea7481 100644
--- a/contrib/lisp/org-export.el
+++ b/contrib/lisp/org-export.el
@@ -354,7 +354,7 @@ If the value is `comment' insert it as a comment."
 	  (const :tag "Insert the sentence" t)))
 
 (defcustom org-export-creator-string
-  (format "Generated by <a href=\"http://orgmode.org\">Org</a> mode %s in <a href=\"http://www.gnu.org/software/emacs/\">Emacs</a> %s."
+  (format "Generated by Org mode %s in Emacs %s."
 	  (if (fboundp 'org-version) (org-version) "(Unknown)")
 	  emacs-version)
   "String to insert at the end of the generated document."