diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index 75289e5bcc5c..e586602c85e9 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -131,7 +131,7 @@ s/\$//g
 		printf "/*\n * System call numbers.\n *\n" > syshdr
 		printf " * DO NOT EDIT-- this file is automatically generated.\n" > syshdr
 		printf " * $%s$\n", "FreeBSD" > syshdr
-		printf "# FreeBSD system call names.\n" > sysmk
+		printf "# FreeBSD system call object files.\n" > sysmk
 		printf "# DO NOT EDIT-- this file is automatically generated.\n" > sysmk
 		printf "# $%s$\n", "FreeBSD" > sysmk
 
@@ -559,9 +559,9 @@ s/\$//g
 		printf("/* %d = %s %s */\n", syscall, descr, funcalias) > sysent
 		printf("\t\"%s.%s\",\t\t/* %d = %s %s */\n",
 		    wrap, funcalias, syscall, descr, funcalias) > sysnames
-		if (flag("COMPAT")) {
-			printf("\t\t\t\t/* %d is old %s */\n",
-			    syscall, funcalias) > syshdr
+		if (flag("COMPAT") || flag("COMPAT4") || flag("COMPAT6")) {
+			printf("\t\t\t\t/* %d is %s %s */\n",
+			    syscall, descr, funcalias) > syshdr
 		} else if (!flag("NODEF")) {
 			printf("#define\t%s%s%s\t%d\n", syscallprefix,
 			    prefix, funcalias, syscall) > syshdr