diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e0ebf52..620c9320 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,11 +152,18 @@ export (EXPORT cascadeTargets
     FILE "${CMAKE_CURRENT_BINARY_DIR}/cascade/cascadeTargets.cmake"
 )
 
-configure_file (cascadeConfig.cmake
+#configure_file (cascadeConfig.cmake
+#    "${CMAKE_CURRENT_BINARY_DIR}/cascade/cascadeConfig.cmake"
+#)
+
+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/cascade)
+
+configure_package_config_file(cascadeConfig.cmake.in
     "${CMAKE_CURRENT_BINARY_DIR}/cascade/cascadeConfig.cmake"
+    INSTALL_DESTINATION ${ConfigPackageLocation}
+    PATH_VARS CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR ConfigPackageLocation
 )
 
-set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/cascade)
 install(EXPORT cascadeTargets
     FILE cascadeTargets.cmake
     NAMESPACE derecho::
diff --git a/build.sh b/build.sh
index beacfe87..ff91c7a9 100755
--- a/build.sh
+++ b/build.sh
@@ -56,11 +56,11 @@ colorful_print() {
 }
 
 if [[ $# -lt 1 ]]; then
-    colorful_print orange "USAGE: $0 <Release|Debug|RelWithDebInfo|Benchmark|Clear> [USE_VERBS_API]"
+    colorful_print orange "USAGE: $0 <Release|Debug|RelWithDebInfo|Benchmark|Clean> [USE_VERBS_API]"
     exit -1
 fi
 
-if [[ $1 == "Clear" ]]; then
+if [[ $1 == "Clean" ]]; then
     rm -rf build-*
     exit 0
 fi
diff --git a/cascadeConfig.cmake b/cascadeConfig.cmake
deleted file mode 100644
index 30caf806..00000000
--- a/cascadeConfig.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set(cascade_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
-set(cascade_LIBRARIES "-L${CMAKE_INSTALL_PREFIX}/lib -lcascade")
diff --git a/cascadeConfig.cmake.in b/cascadeConfig.cmake.in
new file mode 100644
index 00000000..5d57a584
--- /dev/null
+++ b/cascadeConfig.cmake.in
@@ -0,0 +1,7 @@
+@PACKAGE_INIT@
+
+set_and_check(cascade_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
+set(cascade_LIBRARIES "-L@PACKAGE_CMAKE_INSTALL_LIBDIR@ -lcascade")
+include("@PACKAGE_ConfigPackageLocation@/cascadeTargets.cmake")
+
+check_required_components(cascade)