diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 5ca8f73faf9b..0d52313977ce 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -1,57 +1,56 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 NO_LINT=
 
 KRB5DIR=	${SRCTOP}/crypto/heimdal
 
 CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR:H:H}/include
 
 WARNS?=		1
-CWARNFLAGS.clang+=	-Wno-error=absolute-value
-CWARNFLAGS+=	-Wno-error=deprecated-declarations
+CWARNFLAGS.clang+=	-Wno-absolute-value
 
 .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT)
 OPENLDAPBASE?=	/usr/local
 LDAPLDADD=	-lldap -llber
 LDAPDPADD=	${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
 LDAPCFLAGS=	-I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1
 LDAPLDFLAGS=	-L${OPENLDAPBASE}/lib -rpath ${OPENLDAPBASE}/lib
 .endif
 
 .if defined(SRCS)
 
 ETSRCS=	\
 	${KRB5DIR}/lib/asn1/asn1_err.et \
 	${KRB5DIR}/lib/hdb/hdb_err.et \
 	${KRB5DIR}/lib/kadm5/kadm5_err.et \
 	${KRB5DIR}/lib/krb5/heim_err.et \
 	${KRB5DIR}/lib/krb5/k524_err.et \
 	${KRB5DIR}/lib/krb5/krb5_err.et \
 	${KRB5DIR}/lib/krb5/krb_err.et \
 	${KRB5DIR}/lib/hx509/hx509_err.et \
 	${KRB5DIR}/lib/wind/wind_err.et \
 	${KRB5DIR}/lib/ntlm/ntlm_err.et
 
 .if ${MK_GSSAPI} != "no"
 ETSRCS+=	${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et
 .endif
 
 .for ET in ${ETSRCS}
 .for _ET in ${ET:T:R}
 .if ${SRCS:M${_ET}.[ch]} != ""
 .ORDER: ${_ET}.h ${_ET}.c
 ${_ET}.c: .NOMETA
 ${_ET}.h ${_ET}.c: ${ET}
 	compile_et ${.ALLSRC}
 CLEANFILES+=	${_ET}.h ${_ET}.c
 .endif
 .endfor
 .endfor
 
 .endif # defined(SRCS)
 
 ASN1_COMPILE=	asn1_compile
 MAKE_ROKEN=	make-roken
 SLC=		slc
diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile
index fa7a0cfce9cf..35165ef9e424 100644
--- a/kerberos5/libexec/kcm/Makefile
+++ b/kerberos5/libexec/kcm/Makefile
@@ -1,29 +1,31 @@
 # $FreeBSD$
 
 PROG=	kcm
 MAN=	kcm.8
 
 SRCS=	acl.c \
 	acquire.c \
 	cache.c \
 	client.c \
 	config.c \
 	connect.c \
 	events.c \
 	glue.c \
 	log.c \
 	main.c \
 	protocol.c \
 	sessions.c \
 	renew.c
 
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS}
+# Avoid errors for using deprecated krb5_* APIs
+CFLAGS+="-DKRB5_DEPRECATED_FUNCTION(X)="
 LIBADD=	krb5 roken heimntlm heimipcs crypto
 DPADD=	${LDAPDPADD}
 LDADD=	${LIBVERS} ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kcm