diff --git a/devel/json-fortran/Makefile b/devel/json-fortran/Makefile
index c013f28d0338..773b0f98e4b1 100644
--- a/devel/json-fortran/Makefile
+++ b/devel/json-fortran/Makefile
@@ -1,24 +1,33 @@
 PORTNAME=	json-fortran
 DISTVERSION=	9.0.2
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modern Fortran JSON API
 WWW=		https://github.com/jacobwilliams/json-fortran/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	compilation fails: Cannot find an intrinsic module named 'ieee_arithmetic'
 
 USES=		cmake:testing fortran
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jacobwilliams
 
 CMAKE_ON=	USE_GNU_INSTALL_CONVENTION
 CMAKE_OFF=	JSONFORTRAN_ENABLE_TESTS
 CMAKE_TESTING_ON=	JSONFORTRAN_ENABLE_TESTS ENABLE_TESTS
 CMAKE_TESTING_TARGET=	check
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${FORTRAN_DEFAULT} == flang
+PLIST_SUB+=	LIBSUFFIX=llvmflang
+TESTING_UNSAFE=	https://github.com/llvm/llvm-project/issues/161568
+.else
+PLIST_SUB+=	LIBSUFFIX=gnu
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/json-fortran/pkg-plist b/devel/json-fortran/pkg-plist
index ad776f591767..655e8273c350 100644
--- a/devel/json-fortran/pkg-plist
+++ b/devel/json-fortran/pkg-plist
@@ -1,15 +1,15 @@
 include/json_file_module.mod
 include/json_kinds.mod
 include/json_module.mod
 include/json_parameters.mod
 include/json_string_utilities.mod
 include/json_value_module.mod
-lib/cmake/jsonfortran-gnu-9.0.2/jsonfortran-gnu-config-version.cmake
-lib/cmake/jsonfortran-gnu-9.0.2/jsonfortran-gnu-config.cmake
-lib/cmake/jsonfortran-gnu-9.0.2/jsonfortran-gnu-targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/jsonfortran-gnu-9.0.2/jsonfortran-gnu-targets.cmake
+lib/cmake/jsonfortran-%%LIBSUFFIX%%-9.0.2/jsonfortran-%%LIBSUFFIX%%-config-version.cmake
+lib/cmake/jsonfortran-%%LIBSUFFIX%%-9.0.2/jsonfortran-%%LIBSUFFIX%%-config.cmake
+lib/cmake/jsonfortran-%%LIBSUFFIX%%-9.0.2/jsonfortran-%%LIBSUFFIX%%-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/jsonfortran-%%LIBSUFFIX%%-9.0.2/jsonfortran-%%LIBSUFFIX%%-targets.cmake
 lib/libjsonfortran.a
 lib/libjsonfortran.so
 lib/libjsonfortran.so.9.0
 lib/libjsonfortran.so.9.0.2
 libdata/pkgconfig/json-fortran.pc