diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c
index 1cd97ad8b..205b7cb6e 100644
--- a/plugins/sudoers/toke.c
+++ b/plugins/sudoers/toke.c
@@ -481,13 +481,13 @@ static yyconst flex_int16_t yy_accept[896] =
        43,    0,    0,    0,    0,    0,   43,   43,   43,   43,
        43,   43,   43,   43,   53,   53,   53,    0,   37,   53,
 
-       53,    0,   24,    0,   29,   47,    0,   22,   72,   72,
+       53,    0,   24,    0,   29,   47,    0,   22,   20,   72,
        62,    0,   62,   42,   42,   42,   42,   53,   53,   53,
        53,   62,   62,   42,   42,   42,   42,    0,    0,    0,
         0,    0,   43,   43,   43,   43,   43,   43,   43,   43,
        43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
-       43,   43,   52,    0,   32,   53,   53,   53,    0,   72,
-       72,   20,   72,   72,   23,   22,    0,    0,    0,    0,
+       43,   43,   52,    0,   32,   53,   53,   53,    0,   20,
+       20,   20,   20,   72,   23,   22,    0,    0,    0,    0,
         0,   22,    0,    0,    0,   42,   42,   42,   42,   53,
        53,   53,   62,   62,   62,    0,    0,    0,   43,   43,
        43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
@@ -496,9 +496,9 @@ static yyconst flex_int16_t yy_accept[896] =
        23,   20,   72,    0,   22,    0,    0,    0,   53,   53,
        62,   62,   62,   62,   62,    0,    0,    0,    0,    0,
        43,   43,   43,   43,   43,   43,   43,   43,    0,   33,
-       53,   72,    0,    0,    0,    0,    0,   53,   62,   62,
-       62,   43,   43,   43,   43,   43,   43,    0,   31,   72,
-       72,   21,   72,    0,    0,    0,   62,   62,   62,   62,
+       53,   21,    0,    0,    0,    0,    0,   53,   62,   62,
+       62,   43,   43,   43,   43,   43,   43,    0,   31,   21,
+       21,   21,   21,    0,    0,    0,   62,   62,   62,   62,
        62,   43,   43,   43,   43,   43,   21,    0,    0,    0,
         0,    0,   41,   41,   41,   41,   41,   41,   41,   41,
        41,   41,   41,   41,    0
diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l
index 668c5b674..e3343317d 100644
--- a/plugins/sudoers/toke.l
+++ b/plugins/sudoers/toke.l
@@ -285,7 +285,7 @@ DEFVAR			[a-z_]+
 			    yyless(sudoersleng);
 			} /* base64 digest */
 
-<INITIAL>^#include[[:blank:]]+.*\r?\n {
+<INITIAL>^#include[[:blank:]]+.*(\r\n|\n)? {
 			    char *path;
 
 			    if (continued) {
@@ -303,7 +303,7 @@ DEFVAR			[a-z_]+
 				yyterminate();
 			}
 
-<INITIAL>^#includedir[[:blank:]]+.*\r?\n {
+<INITIAL>^#includedir[[:blank:]]+.*(\r\n|\n)? {
 			    char *path;
 
 			    if (continued) {