diff --git a/Makefile.am b/Makefile.am
index 3ec8e4a..9ad5d6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,9 @@ EXTRA_DIST = COPYING.LGPL COPYING.MIT AUTHORS README \
 	test/json.qtest \
 	examples/json-rpc-client.q \
 	examples/JsonRpcServerValidation.q \
-	qore-json-module.spec
+	qore-json-module.spec \
+    CMakeLists.txt \
+    cmake/cmake_uninstall.cmake.in
 
 ACLOCAL_AMFLAGS=-I m4
 
diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
new file mode 100644
index 0000000..02cb12d
--- /dev/null
+++ b/cmake/cmake_uninstall.cmake.in
@@ -0,0 +1,23 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+# this works on Linux, but not on mac.
+#FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+#STRING(REGEX REPLACE "\n" ";" files "${files}")
+#FOREACH(file ${files})
+#  MESSAGE(STATUS "Uninstalling \"${file}\"")
+#  IF(NOT EXISTS "${file}")
+#    MESSAGE(FATAL_ERROR "File \"${file}\" does not exists.")
+#  ENDIF(NOT EXISTS "${file}")
+#  EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
+#    OUTPUT_VARIABLE rm_out
+#    RETURN_VARIABLE rm_retval)
+#  IF("${rm_retval}" GREATER 0)
+#    MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
+#  ENDIF("${rm_retval}" GREATER 0)
+#ENDFOREACH(file)
+
+EXEC_PROGRAM("xargs rm < @CMAKE_BINARY_DIR@/install_manifest.txt"
+            OUTPUT_VARIABLE rm_out
+            RETURN_VARIABLE rm_ret)