diff --git a/src/binding/cxx/mpicxx.h.in b/src/binding/cxx/mpicxx.h.in
index c0370bb..c1bfe52 100644
--- a/src/binding/cxx/mpicxx.h.in
+++ b/src/binding/cxx/mpicxx.h.in
@@ -17,7 +17,7 @@
 // between 3.2.3 and 3.4.3 (!!)  Normally such changes
 // should only occur at major releases (e.g., version 3 to 4)
 #ifdef __GNUC__ 
-# if __GNUC__ >= @GNUCXX_VERSION@ && @GNUCXX_VERSION@ == 3
+# if __GNUC__ >= @GNUCXX_VERSION@ 
 #  if __GNUC_MINOR__ > 2 && @GNUCXX_MINORVERSION@ == 2 
 #  error 'Please use the same version of GCC and g++ for compiling MPICH and user MPI programs'
 #  endif
diff --git a/src/packaging/envmods/mpich.module.in b/src/packaging/envmods/mpich.module.in
index b83718e..3d6b4fa 100644
--- a/src/packaging/envmods/mpich.module.in
+++ b/src/packaging/envmods/mpich.module.in
@@ -3,23 +3,12 @@
 #  MPICH module for use with 'environment-modules' package:
 # 
 
-# Only allow one mpi module to be loaded at a time
-conflict mpi
-
 # Define prefix so PATH and MANPATH can be updated.
-setenv        MPI_BIN       @LIBDIR@/bin
-setenv        MPI_SYSCONFIG @sysconfdir@/@MPINAME@-@ARCH@
-setenv        MPI_FORTRAN_MOD_DIR @fortranmoddir@/@MPINAME@
-setenv        MPI_INCLUDE   @includedir@
-setenv        MPI_LIB       @libdir@
-setenv        MPI_MAN       @mandir@
-setenv        MPI_PYTHON_SITEARCH	@py3sitearch@/@MPINAME@
-setenv        MPI_PYTHON2_SITEARCH	@py3sitearch@/@MPINAME@
-setenv        MPI_PYTHON3_SITEARCH	@py3sitearch@/@MPINAME@
-setenv        MPI_COMPILER  @MPINAME@-@ARCH@
-setenv        MPI_SUFFIX    _@MPINAME@
-setenv        MPI_HOME      @LIBDIR@
+setenv        prefix        @prefix@
+setenv        exec_prefix   @exec_prefix@
 prepend-path  PATH          @bindir@
-prepend-path  LD_LIBRARY_PATH @libdir@
-prepend-path  MANPATH       :@mandir@
-prepend-path  PKG_CONFIG_PATH @LIBDIR@/lib/pkgconfig
+prepend-path  MANPATH       @mandir@
+
+# Undefine prefix and exec_prefix which are too generic environment variables.
+unsetenv      prefix
+unsetenv      exec_prefix