diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 7f7efb09ac..98b7789842 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -12,3 +12,8 @@ FIND_LIBRARY(MPI_LIBRARY
              NAMES mpi mpich
              PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib)
 
+FIND_LIBRARY(MPI_EXTRA_LIBRARY 
+             NAMES mpi++
+             PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib)
+
+MARK_AS_ADVANCED(MPI_INCLUDE_PATH MPI_LIBRARY MPI_EXTRA_LIBRARY)