diff --git a/pkgs/development/compilers/gcc/ng/common/default.nix b/pkgs/development/compilers/gcc/ng/common/default.nix
index 1b83e75015f9..98ce3bb89c1e 100644
--- a/pkgs/development/compilers/gcc/ng/common/default.nix
+++ b/pkgs/development/compilers/gcc/ng/common/default.nix
@@ -121,6 +121,21 @@ makeScopeWithSplicing' {
       };
 
       gfortran = wrapCCWith rec {
+        cc = gccPackages.gfortran-unwrapped;
+        libcxx = targetGccPackages.libstdcxx;
+        bintools = binutils;
+        extraPackages = [
+          targetGccPackages.libgcc
+        ];
+        nixSupport.cc-cflags = [
+          "-B${targetGccPackages.libgcc}/lib"
+          "-B${targetGccPackages.libssp}/lib"
+          "-B${targetGccPackages.libatomic}/lib"
+          "-B${targetGccPackages.libgfortran}/lib/"
+        ];
+      };
+
+      gfortranNoLibgfortran = wrapCCWith rec {
         cc = gccPackages.gfortran-unwrapped;
         libcxx = targetGccPackages.libstdcxx;
         bintools = binutils;
@@ -211,7 +226,7 @@ makeScopeWithSplicing' {
 
       libgfortran = callPackage ./libgfortran {
         stdenv = overrideCC stdenv buildGccPackages.gcc;
-        inherit (buildGccPackages) gfortran;
+        gfortran = buildGccPackages.gfortranNoLibgfortran;
       };
 
       libstdcxx = callPackage ./libstdcxx {