diff --git a/devel/libffcall/Makefile b/devel/libffcall/Makefile
index 46fcdbe4aa8d..b68baf6ccd53 100644
--- a/devel/libffcall/Makefile
+++ b/devel/libffcall/Makefile
@@ -1,7 +1,7 @@
 # Created by: jagapen@home.com
 
 PORTNAME=	libffcall
-PORTVERSION=	2.1
+DISTVERSION=	2.2
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -18,13 +18,11 @@ BROKEN_mips64=		fails to build: gmake[2]: No rule to make target 'avcall-mips64-
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool
-USE_GCC=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=		--enable-shared
+CONFIGURE_ARGS=		--disable-static
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 MAKE_JOBS_UNSAFE=	yes
-CFLAGS+=		-fPIC
 
 PATCHES_powerpc64=	${PATCHDIR}/extra-patch-ffcall-abi.h
 PATCHES_powerpc64le=	${PATCHDIR}/extra-patch-ffcall-abi.h
diff --git a/devel/libffcall/distinfo b/devel/libffcall/distinfo
index d3710d2a4e2a..e9dd4e5121cb 100644
--- a/devel/libffcall/distinfo
+++ b/devel/libffcall/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1533604264
-SHA256 (libffcall-2.1.tar.gz) = a091fb8bbabf17c94a2dae2d41161b96a08ab92b5f75d3364157a2c34d538c47
-SIZE (libffcall-2.1.tar.gz) = 943235
+TIMESTAMP = 1619034445
+SHA256 (libffcall-2.2.tar.gz) = ebfa37f97b6c94fac24ecf3193f9fc829517cf81aee9ac2d191af993d73cb747
+SIZE (libffcall-2.2.tar.gz) = 954623
diff --git a/devel/libffcall/files/patch-common_asm-x86__64.h b/devel/libffcall/files/patch-common_asm-x86__64.h
new file mode 100644
index 000000000000..d30588ec1a7a
--- /dev/null
+++ b/devel/libffcall/files/patch-common_asm-x86__64.h
@@ -0,0 +1,10 @@
+--- common/asm-x86_64.h.orig	2021-04-21 19:56:08 UTC
++++ common/asm-x86_64.h
+@@ -280,6 +280,6 @@
+ #define EH_FRAME_SECTION .eh_frame,"aL",link=.text,@unwind
+ #else
+ // Linux/ELF
+-#define EH_FRAME_SECTION .eh_frame,"aw",@progbits
++#define EH_FRAME_SECTION .eh_frame,"a",@progbits
+ #endif
+ #endif
diff --git a/devel/libffcall/pkg-plist b/devel/libffcall/pkg-plist
index 0017bc9ef4cc..647c49eeaa5a 100644
--- a/devel/libffcall/pkg-plist
+++ b/devel/libffcall/pkg-plist
@@ -5,22 +5,18 @@ include/ffcall-version.h
 include/trampoline.h
 include/vacall.h
 include/vacall_r.h
-lib/libavcall.a
 lib/libavcall.so
 lib/libavcall.so.1
-lib/libavcall.so.1.0.1
-lib/libcallback.a
+lib/libavcall.so.1.0.2
 lib/libcallback.so
 lib/libcallback.so.1
-lib/libcallback.so.1.0.1
-lib/libffcall.a
+lib/libcallback.so.1.0.2
 lib/libffcall.so
 lib/libffcall.so.0
-lib/libffcall.so.0.0.1
-lib/libtrampoline.a
+lib/libffcall.so.0.0.2
 lib/libtrampoline.so
 lib/libtrampoline.so.1
-lib/libtrampoline.so.1.0.1
+lib/libtrampoline.so.1.0.2
 lib/libvacall.a
 man/man3/avcall.3.gz
 man/man3/callback.3.gz