diff --git a/packages/ifpack2/CMakeLists.txt b/packages/ifpack2/CMakeLists.txt
index a540f8206586..b445107eea01 100644
--- a/packages/ifpack2/CMakeLists.txt
+++ b/packages/ifpack2/CMakeLists.txt
@@ -70,25 +70,6 @@ TRIBITS_ADD_ETI_SUPPORT()
 #This replaces an option that was reusing an existing name.
 SET(HAVE_${PACKAGE_NAME_UC}_QD "${PACKAGE_NAME}_ENABLE_QD")
 
-#Adding a define for TPL METIS
-IF (TPL_ENABLE_METIS)
-  SET (IFPACK2_ENABLE_METIS_DEFAULT ON)
-ELSE ()
-  SET (IFPACK2_ENABLE_METIS_DEFAULT OFF)
-ENDIF ()
-TRIBITS_ADD_OPTION_AND_DEFINE(
-  ${PACKAGE_NAME}_ENABLE_METIS
-  HAVE_IFPACK2_METIS
-  "Enable METIS for Ifpack2."
-  ${IFPACK2_ENABLE_METIS_DEFAULT} )
-
-#Adding an option and define when MPI is enabled.
-TRIBITS_ADD_OPTION_AND_DEFINE(
-  ${PACKAGE_NAME}_ENABLE_MPI
-  HAVE_IFPACK2_MPI
-  "Enable MPI build of Ifpack2."
-  ${TPL_ENABLE_MPI} )
-
 ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Lemon)
 ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2)
 ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Cholmod)
diff --git a/packages/ifpack2/cmake/Dependencies.cmake b/packages/ifpack2/cmake/Dependencies.cmake
index fc4a5e176e40..dc5b40abf678 100644
--- a/packages/ifpack2/cmake/Dependencies.cmake
+++ b/packages/ifpack2/cmake/Dependencies.cmake
@@ -3,6 +3,6 @@ SET(LIB_OPTIONAL_DEP_PACKAGES Xpetra Zoltan2Core ThyraTpetraAdapters Amesos2 Shy
 SET(TEST_REQUIRED_DEP_PACKAGES Belos Galeri)
 SET(TEST_OPTIONAL_DEP_PACKAGES Amesos2 ShyLU_NodeHTS ML AztecOO Epetra)
 SET(LIB_REQUIRED_DEP_TPLS)
-SET(LIB_OPTIONAL_DEP_TPLS HYPRE Cholmod Lemon METIS)
+SET(LIB_OPTIONAL_DEP_TPLS HYPRE Cholmod Lemon METIS MPI)
 SET(TEST_REQUIRED_DEP_TPLS)
 SET(TEST_OPTIONAL_DEP_TPLS QD HYPRE METIS)