diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -102,6 +102,7 @@
 OLD_FILES+=usr/share/man/man1/keylogin.1.gz
 OLD_FILES+=usr/share/man/man5/publickey.5.gz
 OLD_FILES+=usr/share/man/man8/keyserv.1.gz
+OLD_FILES+=etc/rc.d/keyserv
 
 # 20241206: Remove Altera DE4 drivers
 OLD_FILES+=usr/share/man/man4/altera_atse.4.gz
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -290,13 +290,10 @@
 _opensm=	opensm
 .endif
 
-.if ${MK_OPENSSL} != "no"
-CONFS+=		keyserv
-.if ${MK_OPENSSL_KTLS} != "no"
+.if ${MK_OPENSSL} != "no" && ${MK_OPENSSL_KTLS} != "no"
 CONFS+=		tlsclntd \
 		tlsservd
 .endif
-.endif
 
 .if ${MK_OPENSSH} != "no"
 CONFGROUPS+=	SSH
diff --git a/libexec/rc/rc.d/keyserv b/libexec/rc/rc.d/keyserv
deleted file mode 100755
--- a/libexec/rc/rc.d/keyserv
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-#
-
-# Start keyserv if we are running Secure RPC
-
-# PROVIDE: keyserv
-# REQUIRE: ypset
-# BEFORE: DAEMON
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="keyserv"
-desc="Server for storing private encryption keys"
-rcvar="keyserv_enable"
-command="/usr/sbin/${name}"
-start_precmd="keyserv_prestart"
-
-: ${keyserv_svcj_options:="net_basic"}
-
-keyserv_prestart()
-{
-	force_depend rpcbind || return 1
-}
-
-load_rc_config $name
-run_rc_command "$1"