Index: head/Mk/Uses/fortran.mk
===================================================================
--- head/Mk/Uses/fortran.mk
+++ head/Mk/Uses/fortran.mk
@@ -4,7 +4,7 @@
 #
 # Feature:	fortran
 # Usage:	USES=fortran
-# Valid ARGS:	gcc (default)
+# Valid ARGS:	flang, gcc (default)
 #
 # MAINTAINER:	fortran@FreeBSD.org
 
@@ -15,11 +15,20 @@
 fortran_ARGS=	gcc
 .endif
 
-.if ${fortran_ARGS} == gcc
+.if ${fortran_ARGS} == flang
+.if ${ARCH} == amd64
+BUILD_DEPENDS+=	flang:devel/flang
+RUN_DEPENDS+=	flang:devel/flang
+F77=		flang
+FC=		flang
+LDFLAGS+=	-L${LOCALBASE}/flang/lib -lflang -lexecinfo
+.else
+IGNORE=		USES=fortran: flang argument only available for amd64
+.endif
+.elif ${fortran_ARGS} == gcc
 _GCC_VER=	${GCC_DEFAULT:S/.//}
 BUILD_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
 RUN_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
-USE_BINUTILS=	yes
 F77=		gfortran${_GCC_VER}
 FC=		gfortran${_GCC_VER}
 FFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
@@ -30,6 +39,7 @@
 IGNORE=		USES=fortran: invalid arguments: ${fortran_ARGS}
 .endif
 
+USE_BINUTILS=	yes
 CONFIGURE_ENV+=	F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"
 MAKE_ENV+=	F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" FCFLAGS="${FCFLAGS}"