diff --git a/bsc/apps/gauss-seidel/default.nix b/bsc/apps/gauss-seidel/default.nix
new file mode 100644
index 0000000..035e017
--- /dev/null
+++ b/bsc/apps/gauss-seidel/default.nix
@@ -0,0 +1,38 @@
+{
+  stdenv
+, nanos6
+, mpi
+, tampi
+, mcxx
+, icc
+}:
+
+stdenv.mkDerivation rec {
+  name = "gauss-seidel";
+
+  src = builtins.fetchGit {
+    url = "ssh://git@bscpm02.bsc.es/benchmarks/ompss-2/heat-conflict-kevin.git";
+    #rev = "25fde23e5ad5f5e2e58418ed269bc2b44642aa17";
+    ref = "master";
+  };
+
+  patchPhase = ''
+    sed -i 's/gcc/icc/g'  Makefile
+    export NIX_DEBUG=6
+    g++ --version
+  '';
+
+  buildInputs = [
+    nanos6
+    mpi
+    icc
+    tampi
+    mcxx
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp heat_* $out/bin/
+  '';
+
+}
diff --git a/default.nix b/default.nix
index 683da82..9549f1a 100644
--- a/default.nix
+++ b/default.nix
@@ -118,6 +118,13 @@ let
       nanos6 = nanos6-git;
     };
 
+    gauss-seidel = callPackage ./bsc/apps/gauss-seidel/default.nix {
+      stdenv = pkgs.gcc7Stdenv;
+      mpi = intel-mpi;
+      tampi = tampi;
+      nanos6 = nanos6-git;
+    };
+
     saiph = callPackage ./bsc/apps/saiph/default.nix {
       stdenv = stdenv-nanos6;
       mpi = intel-mpi;