diff --git a/linux-x64-clang/Dockerfile.in b/linux-x64-clang/Dockerfile.in
index 51c67cd..de9e070 100644
--- a/linux-x64-clang/Dockerfile.in
+++ b/linux-x64-clang/Dockerfile.in
@@ -7,8 +7,11 @@ RUN apt-get update && \
     libssl-dev \
     libc++-dev \
     clang \
+    flang-7 \
     && apt-get clean --yes
 
+RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100 && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
+
 ENV CROSS_TRIPLE x86_64-linux-gnu
 ENV CROSS_ROOT /usr/bin
 ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
@@ -17,7 +20,7 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
     CPP=/usr/bin/clang-cpp \
     CXX=/usr/bin/clang++ \
     LD=/usr/bin/${CROSS_TRIPLE}-ld \
-    FC=/usr/bin/${CROSS_TRIPLE}-gfortran
+    FC=/usr/bin/${CROSS_TRIPLE}-flang
 
 COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop