diff --git a/darshan-runtime/darshan-gen-cc.pl.in b/darshan-runtime/darshan-gen-cc.pl.in
index 89ad61ef593a300e1a64ed470425c5cd57d53661..abe8f997f0eb8924d87eb3f7fdca69d377b7eeaf 100644
--- a/darshan-runtime/darshan-gen-cc.pl.in
+++ b/darshan-runtime/darshan-gen-cc.pl.in
@@ -117,7 +117,11 @@ print OUTPUT<<"EOF";
 # Show is set to echo to cause the compilation command to be echoed instead 
 # of executed.
 Show=
-CC="$CC"
+CC=${CC:-"$CC"}
+if [ -n "$MPICH_CC" ] ; then
+    CC="$MPICH_CC"
+fi
+
 EOF
 
 if ($xl_check == 1)
diff --git a/darshan-runtime/darshan-gen-cxx.pl.in b/darshan-runtime/darshan-gen-cxx.pl.in
index 6dcedfa9be7c05064d4de6f950fad44e6527d3d8..72267b870c03ec8a98ca8c46cab12e3a7ba97ed9 100644
--- a/darshan-runtime/darshan-gen-cxx.pl.in
+++ b/darshan-runtime/darshan-gen-cxx.pl.in
@@ -117,7 +117,11 @@ print OUTPUT<<"EOF";
 # Show is set to echo to cause the compilation command to be echoed instead 
 # of executed.
 Show=
-CXX="$CXX"
+CXX=${CXX:-"$CXX"}
+if [ -n "$MPICH_CC" ] ; then
+    CXX="$MPICH_CXX"
+fi
+
 EOF
 
 if ($xl_check == 1)
diff --git a/darshan-runtime/darshan-gen-fortran.pl.in b/darshan-runtime/darshan-gen-fortran.pl.in
index fce8d8bf3a2084f0657e95035d7a5fee34e95bc5..6f9fb489bb072cf299ca8e78ff042dde3cc7bae4 100644
--- a/darshan-runtime/darshan-gen-fortran.pl.in
+++ b/darshan-runtime/darshan-gen-fortran.pl.in
@@ -117,7 +117,11 @@ print OUTPUT<<"EOF";
 # Show is set to echo to cause the compilation command to be echoed instead 
 # of executed.
 Show=
-FC="$FC"
+FC=${F77:-"$FC"}
+if [ -n "$MPICH_F77" ] ; then
+    FC="$MPICH_F77"
+fi
+
 EOF
 
 if ($xl_check == 1)