diff --git a/etc/bashrc b/etc/bashrc
index 63a5143f3..5aae670e8 100755
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -95,7 +95,7 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty
 
 #
 # For AllMake.stage2
-#export WM_THIRD_PARTY_USE_OPENMPI_165=1
+export WM_THIRD_PARTY_USE_OPENMPI_188=1
 
 #
 # For AllMake.stage3
diff --git a/etc/cshrc b/etc/cshrc
index 0cf6c0bc0..6b29c5005 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -81,7 +81,7 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_DIR/ThirdParty
 
 #
 # For AllMake.stage2
-#setenv WM_THIRD_PARTY_USE_OPENMPI_165 1
+setenv WM_THIRD_PARTY_USE_OPENMPI_188 1
 
 #
 # For AllMake.stage3
@@ -152,7 +152,7 @@ if ( ! $?WM_PRECISION_OPTION ) setenv WM_PRECISION_OPTION DP
 
 # WM_COMPILE_OPTION = Opt | Debug | Prof
 if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
-#setenv WM_COMPILE_OPTION Opt
+setenv WM_COMPILE_OPTION Opt
 #setenv WM_COMPILE_OPTION Debug
 
 # WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI | MVAPICH2