diff --git a/CMake/VTKmConfig.cmake.in b/CMake/VTKmConfig.cmake.in
old mode 100644
new mode 100755
index d80bccba3..9a2025027
--- a/CMake/VTKmConfig.cmake.in
+++ b/CMake/VTKmConfig.cmake.in
@@ -36,6 +36,7 @@ set(VTKm_INCLUDE_DIRS "@VTKm_INCLUDE_DIRS_CONFIG@")
 set(VTKm_MAJOR_VERSION "@VTKm_MAJOR_VERSION@")
 set(VTKm_MINOR_VERSION "@VTKm_MINOR_VERSION@")
 set(VTKm_PATCH_VERSION "@VTKm_PATCH_VERSION@")
+set(VTKm_VERSION "@VTKm_VERSION@")
 
 set(VTKm_REQUIRED_BOOST_VERSION "@VTKm_REQUIRED_BOOST_VERSION@")
 
diff --git a/CMake/VTKmConfigVersion.cmake.in b/CMake/VTKmConfigVersion.cmake.in
deleted file mode 100644
index c9ba2c8da..000000000
--- a/CMake/VTKmConfigVersion.cmake.in
+++ /dev/null
@@ -1,10 +0,0 @@
-set(PACKAGE_VERSION "@VTKm_VERSION@")
-
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
-  set(PACKAGE_VERSION_COMPATIBLE TRUE)
-  if ("${PACKAGE_VERSION}" STREQUAL "${PACKAGE_FIND_VERSION}")
-    set(PACKAGE_VERSION_EXACT TRUE)
-  endif()
-endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db776d003..c15da6624 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ endif()
 
 project (VTKm)
 
-set(VTKm_MAJOR_VERSION 0)
+set(VTKm_MAJOR_VERSION 1)
 set(VTKm_MINOR_VERSION 1)
 set(VTKm_PATCH_VERSION 0)
 set(VTKm_VERSION "${VTKm_MAJOR_VERSION}.${VTKm_MINOR_VERSION}.${VTKm_PATCH_VERSION}")
@@ -235,6 +235,9 @@ if(VTKm_BUILD_EXAMPLES)
 endif(VTKm_BUILD_EXAMPLES)
 
 #-----------------------------------------------------------------------------
+# Ready files for find_package
+include(CMakePackageConfigHelpers)
+
 # Configuration for build directory.
 set(VTKm_INCLUDE_DIRS_CONFIG "${VTKm_SOURCE_DIR};${VTKm_BINARY_DIR}")
 set(VTKm_CMAKE_MODULE_PATH_CONFIG "${VTKm_SOURCE_DIR}/CMake")
@@ -258,11 +261,10 @@ install(FILES ${VTKm_BINARY_DIR}/VTKmConfig.cmake.install
   )
 
 # Create supplemental version configuration file.
-configure_file(
-  ${VTKm_SOURCE_DIR}/CMake/VTKmConfigVersion.cmake.in
+write_basic_package_version_file(
   ${VTKm_BINARY_DIR}/VTKmConfigVersion.cmake
-  @ONLY
-  )
+  VERSION ${VTKm_VERSION}
+  COMPATIBILITY ExactVersion )
 install(FILES ${VTKm_BINARY_DIR}/VTKmConfigVersion.cmake
   DESTINATION ${VTKm_INSTALL_CONFIG_DIR}
   )