diff --git a/contrib/lisp/org-lparse.el b/contrib/lisp/org-lparse.el
index 2fa42c013..fadcbdf1f 100755
--- a/contrib/lisp/org-lparse.el
+++ b/contrib/lisp/org-lparse.el
@@ -1886,7 +1886,7 @@ See `org-xhtml-entity-format-callbacks-alist' for more information."
     (with-temp-buffer
       (org-lparse-bind-local-variables opt-plist)
       (erase-buffer)
-      (org-lparse-begin 'TOC (nth 3 (plist-get opt-plist :lang-words)))
+      (org-lparse-begin 'TOC (nth 3 (plist-get opt-plist :lang-words)) umax-toc)
       (setq
        lines
        (mapcar
diff --git a/contrib/lisp/org-odt.el b/contrib/lisp/org-odt.el
index 944b5b209..cdfb0237a 100644
--- a/contrib/lisp/org-odt.el
+++ b/contrib/lisp/org-odt.el
@@ -908,14 +908,13 @@ styles congruent with the ODF-1.2 specification."
 (defun org-odt-end-footnote-definition (n)
   (org-lparse-end-paragraph))
 
-(defun org-odt-begin-toc (lang-specific-heading)
+(defun org-odt-begin-toc (lang-specific-heading max-level)
   (insert
    (format "
     <text:table-of-content text:style-name=\"Sect2\" text:protected=\"true\" text:name=\"Table of Contents1\">
-     <text:table-of-content-source text:outline-level=\"10\">
+     <text:table-of-content-source text:outline-level=\"%d\">
       <text:index-title-template text:style-name=\"Contents_20_Heading\">%s</text:index-title-template>
-" lang-specific-heading))
-
+" max-level lang-specific-heading))
   (loop for level from 1 upto 10
 	do (insert (format
 		    "
diff --git a/contrib/lisp/org-xhtml.el b/contrib/lisp/org-xhtml.el
index 40ef5715e..c59c56979 100644
--- a/contrib/lisp/org-xhtml.el
+++ b/contrib/lisp/org-xhtml.el
@@ -1067,7 +1067,7 @@ that uses these same face definitions."
   (org-lparse-begin-list-item 'unordered)
   (insert toc-entry))
 
-(defun org-xhtml-begin-toc (lang-specific-heading)
+(defun org-xhtml-begin-toc (lang-specific-heading max-level)
   (org-lparse-insert-tag "<div id=\"table-of-contents\">")
   (insert
    (org-lparse-format 'HEADING lang-specific-heading