diff --git a/docs/CONTRIBUTORS b/docs/CONTRIBUTORS
index cfd5e5f0e..05ee52ac1 100644
--- a/docs/CONTRIBUTORS
+++ b/docs/CONTRIBUTORS
@@ -14,6 +14,7 @@ Garrett Smith
 Geza Lore
 Gianfranco Costamagna
 Howard Su
+Huang Rui
 Iztok Jeras
 James Hanlon
 Jeremy Bennett
diff --git a/src/bisonpre b/src/bisonpre
index 395979575..48cf26eb3 100755
--- a/src/bisonpre
+++ b/src/bisonpre
@@ -212,6 +212,8 @@ sub clean_output {
         $line =~ s!\(YY_\("!(YY_((char*)"!g;
         # Fix bison 2.3 glr-parser warning about yyerrorloc.YYTYPE::yydummy uninit
         $line =~ s!(YYLTYPE yyerrloc;)!$1 yyerrloc.yydummy=0;/*bisonpre*/!g;
+        # Fix bison 3.6.1 unexpected nested-comment
+        $line =~ s!/\* "/\*.*\*/"  \*/!!g;
         $fh->write($line);
     }
     $fh->close;