diff --git a/lib/libsys/syscalls.map b/lib/libsys/syscalls.map
index b79c512834e..eeb75dc28a2 100644
--- a/lib/libsys/syscalls.map
+++ b/lib/libsys/syscalls.map
@@ -353,8 +353,6 @@ FBSDprivate_1.0 {
 	__sys_aio_cancel;
 	_aio_error;
 	__sys_aio_error;
-	_yield;
-	__sys_yield;
 	_mlockall;
 	__sys_mlockall;
 	_munlockall;
diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua
index 8784ff603e8..6f21079d0eb 100644
--- a/sys/tools/makesyscalls.lua
+++ b/sys/tools/makesyscalls.lua
@@ -924,6 +924,10 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype,
 		    config.syscallprefix, funcalias, sysnum))
 		write_line("sysmk", string.format(" \\\n\t%s.o",
 		    funcalias))
+		-- yield has never been exposed as a syscall
+		if funcalias == "yield" then
+			return
+		end
 		if funcalias ~= "exit" and funcalias ~= "vfork" then
 			write_line("libsysmap", string.format("\t_%s;\n",
 			    funcalias))