diff --git a/bsc/tampi/git.nix b/bsc/tampi/git.nix
new file mode 100644
index 0000000..d27ad3e
--- /dev/null
+++ b/bsc/tampi/git.nix
@@ -0,0 +1,26 @@
+{
+  stdenv
+, fetchurl
+, automake
+, autoconf
+, libtool
+, gnumake
+, boost
+, mpi
+, gcc
+, autoreconfHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tampi";
+  version = "${src.shortRev}";
+  enableParallelBuilding = true;
+  buildInputs = [ autoreconfHook automake autoconf libtool gnumake boost mpi gcc ];
+  dontDisableStatic = true;
+  configureFlags = [ "--disable-mpi-mt-check" "CXXFLAGS=-DOMPI_SKIP_MPICXX=1" ];
+
+  src = builtins.fetchGit {
+    url = "ssh://git@bscpm02.bsc.es/interoperability/tampi";
+    ref = "master";
+  };
+}
diff --git a/overlay.nix b/overlay.nix
index f646302..f6007bd 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -82,7 +82,9 @@ let
 
     extrae = callPackage ./bsc/extrae/default.nix { };
 
-    tampi = callPackage ./bsc/tampi/default.nix { };
+    tampi = self.bsc.tampiRelease;
+    tampiRelease = callPackage ./bsc/tampi/default.nix { };
+    tampiGit = callPackage ./bsc/tampi/git.nix { };
 
     mcxxGit = callPackage ./bsc/mcxx/default.nix {
       bison = self.bison_3_5;