diff --git a/dns/dnscap/Makefile b/dns/dnscap/Makefile
index 27871dd53cdd..76751d4557bd 100644
--- a/dns/dnscap/Makefile
+++ b/dns/dnscap/Makefile
@@ -1,44 +1,41 @@
 # Created by: Edwin Groothuis <edwin@mavetju.org>
 
 PORTNAME=	dnscap
 PORTVERSION=	2.0.1
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://www.dns-oarc.net/files/dnscap/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	DNS network traffic capture utility
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libldns.so:dns/ldns
 
 USES=		autoreconf libtool localbase pkgconfig ssl
 
 CONFIGURE_ARGS=	--enable-shared --enable-static
 CONFIGURE_ENV=	libcrypto_CFLAGS=-I${OPENSSLINC}/include \
 		libcrypto_LIBS="-L${OPENSSLLIB}/lib -lcrypto"
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	CDS DOCS THREADS
 OPTIONS_DEFAULT=THREADS
 CDS_DESC=	CBOR DNS Stream (CDS) format (experimental)
 
 CDS_CONFIGURE_OFF=	ac_cv_lib_tinycbor_cbor_parser_init=no
 CDS_LIB_DEPENDS=	libtinycbor.so:devel/tinycbor
 THREADS_CONFIGURE_ENABLE=	threads
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|\(HAVE_\)\(CBOR_CBOR_H\)|\1TINY\2|; s|cbor/cbor.h|tiny&|' ${WRKSRC}/configure.ac ${WRKSRC}/src/dump_cbor.c ${WRKSRC}/src/dump_cds.c
-
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^install-data-am: / s| install-dist_docDATA||' ${WRKSRC}/Makefile.am
 
 post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e '/^dist_doc_DATA = / s| LICENSE||' ${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/dns/dnscap/files/patch-configure.ac b/dns/dnscap/files/patch-configure.ac
new file mode 100644
index 000000000000..719ed0ea6447
--- /dev/null
+++ b/dns/dnscap/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2021-03-11 15:59:57 UTC
++++ configure.ac
+@@ -112,7 +112,7 @@ AC_HEADER_RESOLV
+ AC_HEADER_TIME
+ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h])
+ AC_CHECK_HEADERS([sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
+-AC_CHECK_HEADERS([ldns/ldns.h arpa/nameser_compat.h cbor.h cbor/cbor.h])
++AC_CHECK_HEADERS([ldns/ldns.h arpa/nameser_compat.h cbor.h tinycbor/cbor.h])
+ AC_CHECK_HEADERS([sys/time.h])
+ AC_CHECK_HEADERS([zlib.h])
+ AC_CHECK_HEADERS([openssl/conf.h openssl/evp.h openssl/err.h])
diff --git a/dns/dnscap/files/patch-src-config.h.in b/dns/dnscap/files/patch-src-config.h.in
new file mode 100644
index 000000000000..5852ebecde71
--- /dev/null
+++ b/dns/dnscap/files/patch-src-config.h.in
@@ -0,0 +1,13 @@
+--- src/config.h.in.orig	2021-03-11 16:02:41 UTC
++++ src/config.h.in
+@@ -9,8 +9,8 @@
+ /* Define to 1 if you have the <arpa/nameser.h> header file. */
+ #undef HAVE_ARPA_NAMESER_H
+ 
+-/* Define to 1 if you have the <cbor/cbor.h> header file. */
+-#undef HAVE_CBOR_CBOR_H
++/* Define to 1 if you have the <tinycbor/cbor.h> header file. */
++#undef HAVE_TINYCBOR_CBOR_H
+ 
+ /* Define to 1 if you have the <cbor.h> header file. */
+ #undef HAVE_CBOR_H
diff --git a/dns/dnscap/files/patch-src-dump_cbor.c b/dns/dnscap/files/patch-src-dump_cbor.c
new file mode 100644
index 000000000000..cea1f8186640
--- /dev/null
+++ b/dns/dnscap/files/patch-src-dump_cbor.c
@@ -0,0 +1,13 @@
+--- src/dump_cbor.c.orig	2021-02-12 16:29:40 UTC
++++ src/dump_cbor.c
+@@ -60,8 +60,8 @@
+ #if HAVE_LIBTINYCBOR
+ 
+ #include <ldns/ldns.h>
+-#if HAVE_CBOR_CBOR_H
+-#include <cbor/cbor.h>
++#if HAVE_TINYCBOR_CBOR_H
++#include <tinycbor/cbor.h>
+ #endif
+ #if HAVE_CBOR_H
+ #include <cbor.h>
diff --git a/dns/dnscap/files/patch-src-dump_cds.c b/dns/dnscap/files/patch-src-dump_cds.c
new file mode 100644
index 000000000000..c54cefb95322
--- /dev/null
+++ b/dns/dnscap/files/patch-src-dump_cds.c
@@ -0,0 +1,13 @@
+--- src/dump_cds.c.orig	2021-02-12 16:29:40 UTC
++++ src/dump_cds.c
+@@ -42,8 +42,8 @@
+ #if HAVE_LIBTINYCBOR
+ 
+ #include <stdlib.h>
+-#if HAVE_CBOR_CBOR_H
+-#include <cbor/cbor.h>
++#if HAVE_TINYCBOR_CBOR_H
++#include <tinycbor/cbor.h>
+ #endif
+ #if HAVE_CBOR_H
+ #include <cbor.h>