diff --git a/security/sks/Makefile b/security/sks/Makefile
index 93a60784edcb..823a8822b3e4 100644
--- a/security/sks/Makefile
+++ b/security/sks/Makefile
@@ -1,46 +1,48 @@
 PORTNAME=	sks
 PORTVERSION=	1.1.6
 CATEGORIES=	security
 MASTER_SITES=	http://bitbucket.org/skskeyserver/sks-keyserver/downloads/
 
 EXTRA_PATCHES=	${FILESDIR}/debian-bug-870150:-p1
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Synchronizing Key Server, a fast OpenPGP keyserver
 
 LICENSE=	GPLv2+
 
 USE_OCAML=	yes
 USE_OCAML_CAMLP4=yes
 USES=		bdb:5 perl5 gmake shebangfix tar:tgz
 USE_PERL5=	build
 MAKE_JOBS_UNSAFE=yes
 SHEBANG_FILES=	sks_build.sh
 
 MAKE_ENV=	BDBINCLUDE="-I${BDB_INCLUDE_DIR}" \
 		BDBLIB="-L${BDB_LIB_DIR}" \
 		LIBDB="-l${BDB_LIB_NAME}" \
 		MANDIR="${MANPREFIX}/man"
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@: > ${WRKSRC}/Makefile.local
 	@${REINPLACE_CMD} 's/-ccopt -pg //' ${WRKSRC}/Makefile
 	@cd ${WRKSRC} && ${RM} .depend
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^CC=/d; /^CFLAGS=/s/=/+=/' ${WRKSRC}/bdb/Makefile
+	@${REINPLACE_CMD} -E '/^\+OCAML(C|OPT)=/s,$$, -unsafe-string,' \
+		${WRKSRC}/cryptokit-1.7-sks.patch
 
 pre-build:
 	@cd ${WRKSRC} && test -f .depend || ${MAKE_CMD} dep
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} BUGS README.md TODO UPGRADING \
 		 ${STAGEDIR}${DOCSDIR}
 	@cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} sks sks_add_mail
 
 .include <bsd.port.mk>
diff --git a/security/sks/files/patch-Makefile b/security/sks/files/patch-Makefile
index 86d7c495fa7a..f7071a5b7447 100644
--- a/security/sks/files/patch-Makefile
+++ b/security/sks/files/patch-Makefile
@@ -1,50 +1,58 @@
---- Makefile.orig	2019-06-06 15:28:32 UTC
+--- Makefile.orig	2021-09-05 17:11:36 UTC
 +++ Makefile
-@@ -15,9 +15,8 @@
+@@ -15,16 +15,15 @@
  #   USA
  #
  CINCLUDES=-I`ocamlc -where`
 -CC=gcc
  CXX=g++
 -CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
 +CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
  CXXFLAGS=-O3 $(CINCLUDES) -I .
  
  ifndef OCAMLC
+ 	OCAMLC=ocamlc
+ endif
+ ifndef OCAMLOPT
+-	OCAMLOPT=ocamlopt
++	OCAMLOPT=ocamlopt -unsafe-string
+ endif
+ ifndef CAMLP4O
+ 	CAMLP4O=camlp4o
 @@ -135,16 +134,16 @@ keyMerge.cmx: keyMerge.ml
  # Special targets
  
  install:
 -	mkdir -p $(PREFIX)/bin
 -	install sks_build.sh sks sks_add_mail $(PREFIX)/bin
 -	mkdir -p $(MANDIR)/man8
 -	install sks.8.gz $(MANDIR)/man8
 +	mkdir -p $(DESTDIR)$(PREFIX)/bin
 +	install sks_build.sh sks sks_add_mail $(DESTDIR)$(PREFIX)/bin
 +	mkdir -p $(DESTDIR)$(MANDIR)/man8
 +	install sks.8.gz $(DESTDIR)$(MANDIR)/man8
  
  install.bc:
 -	mkdir -p $(PREFIX)/bin
 -	install sks_build.bc.sh sks.bc sks_add_mail.bc $(PREFIX)/bin
 -	mkdir -p $(MANDIR)/man8
 -	install sks.8.gz $(MANDIR)/man8
 +	mkdir -p $(DESTDIR)$(PREFIX)/bin
 +	install sks_build.bc.sh sks.bc sks_add_mail.bc $(DESTDIR)$(PREFIX)/bin
 +	mkdir -p $(DESTDIR)$(MANDIR)/man8
 +	install sks.8.gz $(DESTDIR)$(MANDIR)/man8
  
  
  Makefile.local:
 @@ -285,8 +284,9 @@ CKDIR=$(CKVER)/src
  
  $(CKVER)/README.txt:
  	tar xmvfz $(CKVER).tar.gz
 -	patch -p 0 < $(CKVER)-sks.patch
 -	patch -p 0 < $(CKVER)-sks-custom_compare.patch
 +	patch -p0 < $(CKVER)-sks.patch
 +	patch -p0 < $(CKVER)-sks-custom_compare.patch
 +	sed -i.bak -e 's,uint32,&_t,' $(CKDIR)/stubs-md5.c
  
  $(CKDIR)/cryptokit.cma: $(CKVER)/README.txt
  	cd $(CKDIR) && $(MAKE) all