diff --git a/CMake/VTKmConfig.cmake.in b/CMake/VTKmConfig.cmake.in
index 18ee72bc9..19ab144a4 100755
--- a/CMake/VTKmConfig.cmake.in
+++ b/CMake/VTKmConfig.cmake.in
@@ -63,6 +63,7 @@ set(VTKm_ENABLE_CUDA "@VTKm_ENABLE_CUDA@")
 set(VTKm_ENABLE_TBB "@VTKm_ENABLE_TBB@")
 set(VTKm_ENABLE_OSMESA "@VTKm_ENABLE_OSMESA@")
 set(VTKm_ENABLE_RENDERING "@VTKm_ENABLE_RENDERING@")
+set(VTKm_ENABLE_MPI "@VTKm_ENABLE_MPI@")
 
 # Load the library exports, but only if not compiling VTK-m itself
 set_and_check(VTKm_CONFIG_DIR "@PACKAGE_VTKm_INSTALL_CONFIG_DIR@")
diff --git a/CMake/VTKmConfigureComponents.cmake b/CMake/VTKmConfigureComponents.cmake
index 1281b421b..f167b925c 100644
--- a/CMake/VTKmConfigureComponents.cmake
+++ b/CMake/VTKmConfigureComponents.cmake
@@ -104,6 +104,13 @@ macro(vtkm_configure_component_Base)
     include(VTKmCompilerOptimizations)
   endif()
 
+  # For now, MPI support is a compile time option.
+  if (VTKm_ENABLE_MPI)
+    if (NOT MPI_C_FOUND)
+      find_package(MPI ${VTKm_FIND_PACKAGE_QUIETLY})
+    endif()
+  endif()
+
   # Check for the existance of the base vtkm target
   if (TARGET vtkm)
     set(VTKm_base_vtkm_target_FOUND True)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e196dc4d3..51fdb0e11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,6 +119,7 @@ option(VTKm_ENABLE_RENDERING "Enable rendering library" ON)
 option(VTKm_ENABLE_TESTING "Enable VTKm Testing" ON)
 option(VTKm_ENABLE_BENCHMARKS "Enable VTKm Benchmarking" OFF)
 option(VTKm_ENABLE_OSMESA "Enable creating the OSMesa canvas" OFF)
+option(VTKm_ENABLE_MPI "Enable MPI support" OFF)
 
 option(VTKm_ENABLE_DOCUMENTATION "Build Doxygen documentation" OFF)
 option(VTKm_ENABLE_EXAMPLES "Build examples" OFF)