diff --git a/devel/fnccheck/Makefile b/devel/fnccheck/Makefile
index abce4c3ce95b..85f80e38596e 100644
--- a/devel/fnccheck/Makefile
+++ b/devel/fnccheck/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	fnccheck
 PORTVERSION=	3.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}
 DISTNAME=	FunctionCheck-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Profiling library/utilities for C/C++ programs
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
+BUILD_DEPENDS=  gnulibiberty>=2.19.1:devel/gnulibiberty
 LIB_DEPENDS=	libbfd.so:devel/libbfd
 
 USES=		autoreconf libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 STRIP=		# none
 
 INFO=		libfc
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-ldl|| ; \
 		 s|-Wall -O3|-Wall|'
 	@${REINPLACE_CMD} -e \
 		'/^SUBDIRS/s|test||' ${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/devel/fnccheck/files/patch-src_fcdump_demangle.h b/devel/fnccheck/files/patch-src_fcdump_demangle.h
new file mode 100644
index 000000000000..7c2e56b9ba92
--- /dev/null
+++ b/devel/fnccheck/files/patch-src_fcdump_demangle.h
@@ -0,0 +1,13 @@
+--- src/fcdump/demangle.h.orig	2021-05-10 22:03:39 UTC
++++ src/fcdump/demangle.h
+@@ -16,8 +16,9 @@
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.  */
++#include <libiberty/demangle.h>
+ 
+-#if !defined (DEMANGLE_H)
++#if 0
+ #define DEMANGLE_H
+ 
+ #include <ansidecl.h>
diff --git a/devel/fnccheck/files/patch-src_fcdump_fc__dump.c b/devel/fnccheck/files/patch-src_fcdump_fc__dump.c
new file mode 100644
index 000000000000..c7635681b4c4
--- /dev/null
+++ b/devel/fnccheck/files/patch-src_fcdump_fc__dump.c
@@ -0,0 +1,11 @@
+--- src/fcdump/fc_dump.c.orig	2021-05-10 22:05:35 UTC
++++ src/fcdump/fc_dump.c
+@@ -597,7 +597,7 @@ int main(int argc, char *argv[])
+                 if (strcmp(argv[i], "-demangle-gnu") == 0)
+             {/* demangle names */
+                 demangle = 1;
+-                style = DMGL_GNU;
++                style = DMGL_GNU_V3;
+             }
+             else
+                 if (strcmp(argv[i], "-demangle-java") == 0)
diff --git a/devel/fnccheck/files/patch-src_fcdump_fc__names.c b/devel/fnccheck/files/patch-src_fcdump_fc__names.c
new file mode 100644
index 000000000000..2aa44f508eeb
--- /dev/null
+++ b/devel/fnccheck/files/patch-src_fcdump_fc__names.c
@@ -0,0 +1,11 @@
+--- src/fcdump/fc_names.c.orig	2021-05-10 22:04:48 UTC
++++ src/fcdump/fc_names.c
+@@ -99,7 +99,7 @@ int fc_open_bfd_file(char *name, bfd **core_bfd, int *
+     switch (bfd_get_arch(*core_bfd))
+     {
+         case bfd_arch_vax:
+-        case bfd_arch_tahoe:
++        /* case bfd_arch_tahoe: */
+             *core_offset_to_code = 2;
+             break;
+         case bfd_arch_alpha: