diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index e54d790ee414..c3b02b0ffe02 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -163,25 +163,25 @@ char *body[] =
     "#define YYERROR goto yyerrlab",
     "",
     "#ifndef YYPARSE_PARAM",
-    "#define YYPARSE_PARAM",
     "#if defined(__cplusplus) || __STDC__",
-    "#define YYPARSE_PARAM_TYPE void",
+    "#define YYPARSE_PARAM_ARG void",
+    "#define YYPARSE_PARAM_DECL",
     "#else	/* ! ANSI-C/C++ */",
-    "#define YYPARSE_PARAM_TYPE",
+    "#define YYPARSE_PARAM_ARG",
+    "#define YYPARSE_PARAM_DECL",
     "#endif	/* ANSI-C/C++ */",
-    "#else	/* ! YYPARSE_PARAM */",
+    "#else	/* YYPARSE_PARAM */",
     "#ifndef YYPARSE_PARAM_TYPE",
     "#define YYPARSE_PARAM_TYPE void *",
     "#endif",
-    "#endif	/* ! YYPARSE_PARAM */",
-    "",
     "#if defined(__cplusplus) || __STDC__",
     "#define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM",
     "#define YYPARSE_PARAM_DECL",
     "#else	/* ! ANSI-C/C++ */",
-    "#define YYPARSE_PARAM_ARG YYPARSE_PARAM;",
+    "#define YYPARSE_PARAM_ARG YYPARSE_PARAM",
     "#define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM;",
     "#endif	/* ANSI-C/C++ */",
+    "#endif	/* ! YYPARSE_PARAM */",
     "",
     "int",
     "yyparse (YYPARSE_PARAM_ARG)",