diff --git a/Packages/Manual_tools/src/cc_extract_html.C b/Packages/Manual_tools/src/cc_extract_html.C
index b6056f55b3d..2920a4dba9d 100644
--- a/Packages/Manual_tools/src/cc_extract_html.C
+++ b/Packages/Manual_tools/src/cc_extract_html.C
@@ -21,7 +21,7 @@
 #include <assert.h>
 
 #include <map.h>
-// Repair what the STL bool definitions made wrong.
+// Repair, what the STL bool definitions made wrong.
 #ifdef bool
 #undef bool
 #endif
diff --git a/Packages/Manual_tools/src/html_lex.yy b/Packages/Manual_tools/src/html_lex.yy
index ed6848b7ed2..efd29acc649 100644
--- a/Packages/Manual_tools/src/html_lex.yy
+++ b/Packages/Manual_tools/src/html_lex.yy
@@ -1457,7 +1457,8 @@ calblockintro   ([\{][\\](cal))|([\\]mathcal[\{])
 
  /* Support for the Bibliography */
  /* ---------------------------- */
-[\\]begin[\{]thebibliography[\}][\{][^\}]*[\}]    {
+[\\]begin[\{]thebibliography[\}]    {
+		    BEGIN( NestingMode);
 		    return BEGINBIBLIO;		    
                  }
 [\\]end[\{]thebibliography[\}]   {
diff --git a/Packages/Manual_tools/src/html_syntax.y b/Packages/Manual_tools/src/html_syntax.y
index 0fc259f1c03..d4bff138fab 100644
--- a/Packages/Manual_tools/src/html_syntax.y
+++ b/Packages/Manual_tools/src/html_syntax.y
@@ -681,10 +681,14 @@ global_tagged_declarator:
 		                          handleString( "</H4>\n");
 					  delete $2;
 		                      }
-                | BEGINBIBLIO
+                | BEGINBIBLIO  '{' nested_token_sequence '}'
+                                      {   set_INITIAL = 1;
+				          delete $3;
+                                      }
 		  comment_sequence
-                  ENDBIBLIO           {   handleBiblio( * $2); 
-                                          delete $2;
+		  ENDBIBLIO           {
+                                          handleBiblio( * $6); 
+                                          delete $6;
 		                      }
 		| FUNCTION      declaration   comment_group {
 		                  handleFunctionDeclaration( $2->string(),