--- src/packaging/envmods/mpich2.module.in	2009-07-02 15:54:58.000000000 -0400
+++ src/packaging/envmods/mpich2.module.in.new	2010-09-22 14:27:49.950096538 -0400
@@ -4,11 +4,17 @@
 # 
 
 # Define prefix so PATH and MANPATH can be updated.
-setenv        prefix        @prefix@
-setenv        exec_prefix   @exec_prefix@
+setenv        MPI_BIN       @LIBDIR@/@MPILIBNAME@2/bin
+setenv        MPI_SYSCONFIG @sysconfdir@
+setenv        MPI_FORTRAN_MOD_DIR @includedir@
+setenv        MPI_INCLUDE   @includedir@
+setenv        MPI_LIB       @libdir@
+setenv        MPI_MAN       @mandir@
+setenv        MPI_PYTHON_SITEARCH	@pysitearch@/@MPILIBNAME@2
+setenv        MPI_COMPILER  @MPILIBNAME@2-@ARCH@
+setenv        MPI_SUFFIX    _@MPILIBNAME@2
+setenv        MPI_HOME      @LIBDIR@/@MPILIBNAME@2
 prepend-path  PATH          @bindir@
+prepend-path  LD_LIBRARY_PATH @libdir@
 prepend-path  MANPATH       @mandir@
-
-# Undefine prefix and exec_prefix which are too generic environment variables.
-unsetenv      prefix
-unsetenv      exec_prefix
+prepend-path  PYTHONPATH    @pysitearch@/@MPILIBNAME@2