diff --git a/bsc/mpich/default.nix b/bsc/mpich/default.nix
index bf406c1..3f174c4 100644
--- a/bsc/mpich/default.nix
+++ b/bsc/mpich/default.nix
@@ -1,13 +1,16 @@
 {
-  stdenv,
-  fetchurl,
-  perl,
-  gfortran,
-  openssh,
-  hwloc,
-  libfabric
+  stdenv
+, fetchurl
+, perl
+, gfortran
+, openssh
+, hwloc
+, libfabric
+, enableDebug ? false
 }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation  rec {
   pname = "mpich";
   version = "3.3.2";
@@ -22,7 +25,8 @@ stdenv.mkDerivation  rec {
     "--enable-sharedlib"
     "--with-device=ch4:ofi"
     "--with-libfabric=${libfabric}"
-  ];
+  ]
+  ++ optional enableDebug "--enable-g=dbg,log";
 
   enableParallelBuilding = true;
 
diff --git a/default.nix b/default.nix
index a3a2028..2eabca1 100644
--- a/default.nix
+++ b/default.nix
@@ -43,6 +43,7 @@ let
     osumb = callPackage ./bsc/osu/default.nix { };
 
     mpich = callPackage ./bsc/mpich/default.nix { };
+    mpichDbg = callPackage ./bsc/mpich/default.nix { enableDebug = true; };
 
     # Default Intel MPI version is 2019 (the last one)
     impi = intel-mpi;