diff --git a/bsc/intel-compiler/default.nix b/bsc/intel-compiler/default.nix
index 1a5dd83..946fa24 100644
--- a/bsc/intel-compiler/default.nix
+++ b/bsc/intel-compiler/default.nix
@@ -15,6 +15,8 @@ in wrapCCWith rec {
   cc = icc-unwrapped;
   extraBuildCommands = ''
     echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
+    echo "-isystem ${icc-unwrapped}/include" >> $out/nix-support/cc-cflags
+    echo "-isystem ${icc-unwrapped}/include/intel64" >> $out/nix-support/cc-cflags
     echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
     echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
 
@@ -24,5 +26,6 @@ in wrapCCWith rec {
     # Create the wrappers for icc and icpc
     wrap icc  $wrapper $ccPath/icc
     wrap icpc $wrapper $ccPath/icpc
+    wrap ifort $wrapper $ccPath/ifort
   '';
 }
diff --git a/bsc/intel-compiler/icc2020.nix b/bsc/intel-compiler/icc2020.nix
index 6d92011..08c6906 100644
--- a/bsc/intel-compiler/icc2020.nix
+++ b/bsc/intel-compiler/icc2020.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
       cp -a bin/intel64/* $out/bin/
       cp -a compiler/include/* $out/include/
       cp -a compiler/lib/intel64_lin/* $out/lib/
+      ln -s lib $out/lib_lin
       rm $out/lib/*.dbg
     popd
   '';