diff --git a/devel/libunwind/Makefile b/devel/libunwind/Makefile
index a404f9df3595..5ab156895129 100644
--- a/devel/libunwind/Makefile
+++ b/devel/libunwind/Makefile
@@ -1,37 +1,46 @@
 # Created by: stas@FreeBSD.org
 
 PORTNAME=	libunwind
 PORTVERSION=	20211201	# This is the release date on https://download.savannah.gnu.org/releases/libunwind/
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SAVANNAH \
 		https://github.com/libunwind/libunwind/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-1.6.2
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Generic stack unwinding library
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 USES=		compiler:c11 cpe libtool pathfix pkgconfig
 
-CONFIGURE_ARGS=	ac_cv_path_LATEX2MAN=${TRUE}
+CONFIGURE_ARGS=	--disable-cxx-exceptions \
+		--disable-unwind-header \
+		ac_cv_path_LATEX2MAN=${TRUE}
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	ARCH=${ARCH:S|amd64|x86_64|:C|armv.|arm|:S|i386|x86|:C|powerpc64.*|ppc64|}
 
 CPE_VENDOR=	libunwind_project
 
 .include <bsd.port.pre.mk>
 
 .if !${ARCH:Mpowerpc64*}
 PLIST_SUB+=	COREDUMP=""
 .else
 PLIST_SUB+=	COREDUMP="@comment "
 .endif
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400052
+PLIST_FILES+=	include/unwind.h
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/unwind.h ${STAGEDIR}${PREFIX}/include
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/devel/libunwind/files/unwind.h b/devel/libunwind/files/unwind.h
new file mode 100644
index 000000000000..2d79ed4428de
--- /dev/null
+++ b/devel/libunwind/files/unwind.h
@@ -0,0 +1,26 @@
+#ifndef _LIBUNWIND_UNWIND_H
+#define _LIBUNWIND_UNWIND_H
+
+#if __has_include("/usr/include/unwind.h")
+#include "/usr/include/unwind.h"
+#elif __has_include("/usr/include/c++/v1/unwind.h")
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__arm__) && !defined(__ARM_DWARF_EH__)
+#include "/usr/include/c++/v1/unwind-arm.h"
+#else
+#include "/usr/include/c++/v1/unwind-itanium.h"
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#else
+#include_next <unwind.h>
+#endif
+
+#endif
diff --git a/devel/libunwind/pkg-plist b/devel/libunwind/pkg-plist
index a776ec5d56b2..73e648228c4a 100644
--- a/devel/libunwind/pkg-plist
+++ b/devel/libunwind/pkg-plist
@@ -1,67 +1,66 @@
 include/libunwind-common.h
 %%COREDUMP%%include/libunwind-coredump.h
 include/libunwind-dynamic.h
 include/libunwind-ptrace.h
 include/libunwind-%%ARCH%%.h
 include/libunwind.h
-include/unwind.h
 %%COREDUMP%%lib/libunwind-coredump.a
 %%COREDUMP%%lib/libunwind-coredump.so
 %%COREDUMP%%lib/libunwind-coredump.so.0
 %%COREDUMP%%lib/libunwind-coredump.so.0.0.0
 lib/libunwind-generic.a
 lib/libunwind-generic.so
 lib/libunwind-ptrace.a
 lib/libunwind-ptrace.so
 lib/libunwind-ptrace.so.0
 lib/libunwind-ptrace.so.0.0.0
 lib/libunwind-setjmp.a
 lib/libunwind-setjmp.so
 lib/libunwind-setjmp.so.0
 lib/libunwind-setjmp.so.0.0.0
 lib/libunwind-%%ARCH%%.a
 lib/libunwind-%%ARCH%%.so
 lib/libunwind-%%ARCH%%.so.8
 lib/libunwind-%%ARCH%%.so.8.0.1
 lib/libunwind.a
 lib/libunwind.so
 lib/libunwind.so.8
 lib/libunwind.so.8.0.1
 %%COREDUMP%%libdata/pkgconfig/libunwind-coredump.pc
 libdata/pkgconfig/libunwind-generic.pc
 libdata/pkgconfig/libunwind-ptrace.pc
 libdata/pkgconfig/libunwind-setjmp.pc
 libdata/pkgconfig/libunwind.pc
 man/man3/_U_dyn_cancel.3.gz
 man/man3/_U_dyn_register.3.gz
 man/man3/libunwind-dynamic.3.gz
 man/man3/libunwind-ia64.3.gz
 man/man3/libunwind-ptrace.3.gz
 man/man3/libunwind-setjmp.3.gz
 man/man3/libunwind.3.gz
 man/man3/unw_apply_reg_state.3.gz
 man/man3/unw_backtrace.3.gz
 man/man3/unw_create_addr_space.3.gz
 man/man3/unw_destroy_addr_space.3.gz
 man/man3/unw_flush_cache.3.gz
 man/man3/unw_get_accessors.3.gz
 man/man3/unw_get_fpreg.3.gz
 man/man3/unw_get_proc_info.3.gz
 man/man3/unw_get_proc_info_by_ip.3.gz
 man/man3/unw_get_proc_name.3.gz
 man/man3/unw_get_reg.3.gz
 man/man3/unw_getcontext.3.gz
 man/man3/unw_init_local.3.gz
 man/man3/unw_init_local2.3.gz
 man/man3/unw_init_remote.3.gz
 man/man3/unw_is_fpreg.3.gz
 man/man3/unw_is_signal_frame.3.gz
 man/man3/unw_reg_states_iterate.3.gz
 man/man3/unw_regname.3.gz
 man/man3/unw_resume.3.gz
 man/man3/unw_set_cache_size.3.gz
 man/man3/unw_set_caching_policy.3.gz
 man/man3/unw_set_fpreg.3.gz
 man/man3/unw_set_reg.3.gz
 man/man3/unw_step.3.gz
 man/man3/unw_strerror.3.gz