diff --git a/Packages/Manual_tools/src/cc_extract_html.C b/Packages/Manual_tools/src/cc_extract_html.C
index 182cd99214b..bbec145747b 100644
--- a/Packages/Manual_tools/src/cc_extract_html.C
+++ b/Packages/Manual_tools/src/cc_extract_html.C
@@ -32,6 +32,7 @@ const char* prog_release = "$Revision$";
 
 /* Flexibility for HTML class files. */
 /* ================================= */
+bool html_no_class_toc   = false;
 bool html_no_class_file  = false;
 bool html_no_class_links = false;
 bool html_no_class_index = false;
@@ -3167,8 +3168,9 @@ void handleClassFile( char* filename, const char* formatted_reference) {
     }
 
     // table of contents
-    *contents_stream << "        <UL><LI> " << formatted_reference
-		     << "</UL>" << endl;
+    if ( ! html_no_class_toc)
+	*contents_stream << "        <UL><LI> " << formatted_reference
+			 << "</UL>" << endl;
 
     current_stream   = class_stream;
     current_filename = class_filename;
@@ -3358,6 +3360,7 @@ void handleClassEnd( void) {
     html_no_class_links = false;
     html_no_class_file  = false;
     html_no_class_index = false;
+    html_no_class_toc   = false;
 }
 
 char* templateClassBaseName( const char* classname) {
diff --git a/Packages/Manual_tools/src/html_config.h b/Packages/Manual_tools/src/html_config.h
index 7cb05e68c4d..059396e3bf7 100644
--- a/Packages/Manual_tools/src/html_config.h
+++ b/Packages/Manual_tools/src/html_config.h
@@ -65,6 +65,7 @@ const char* find_sort_key( const char* txt);
 
 /* Flexibility for HTML class files. */
 /* ================================= */
+extern bool html_no_class_toc;
 extern bool html_no_class_file;
 extern bool html_no_class_links;
 extern bool html_no_class_index;
diff --git a/Packages/Manual_tools/src/html_lex.yy b/Packages/Manual_tools/src/html_lex.yy
index 94555be2c0d..8f39533b92c 100644
--- a/Packages/Manual_tools/src/html_lex.yy
+++ b/Packages/Manual_tools/src/html_lex.yy
@@ -631,6 +631,10 @@ calblockintro   ([\{][\\](cal))|([\\]mathcal[\{])
 
  /* Flexibility for HTML class files. */
  /* -------------------------------------------------------------- */
+<INITIAL,MMODE,NestingMode>[\\]ccHtmlNoClassToc/{noletter}    {
+		    skipspaces();
+		    html_no_class_toc = true;
+}
 <INITIAL,MMODE,NestingMode>[\\]ccHtmlNoClassFile/{noletter}    {
 		    skipspaces();
 		    html_no_class_file = true;