diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
index 25dd9b86..8cfd85b4 100644
--- a/src/test/unittests/CMakeLists.txt
+++ b/src/test/unittests/CMakeLists.txt
@@ -28,7 +28,7 @@ set(src
 	synergy/CClipboardTests.cpp
 	synergy/CKeyStateTests.cpp
 	client/CServerProxyTests.cpp
-	synergy/CCryptoTests.cpp
+#	synergy/CCryptoTests.cpp
 )
 
 set(inc
@@ -43,7 +43,7 @@ set(inc
 	../../lib/synergy
 	../../../tools/gtest-1.6.0/include
 	../../../tools/gmock-1.6.0/include
-	../../../tools/cryptopp561
+#	../../../tools/cryptopp561
 	io
 	synergy
 )
@@ -63,4 +63,4 @@ endif()
 include_directories(${inc})
 add_executable(unittests ${src})
 target_link_libraries(unittests
-	arch base client common io net platform server synergy mt gtest gmock cryptopp ${libs})
+	arch base client common io net platform server synergy mt gtest gmock ${libs})
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index cfb33091..79ae1a2d 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -14,13 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set(cpp_dir cryptopp561)
+#set(cpp_dir cryptopp561)
 
-file(GLOB cpp_src ${cpp_dir}/*.cpp)
+#file(GLOB cpp_src ${cpp_dir}/*.cpp)
 
-if (WIN32)
-  file(GLOB cpp_hdr ${cpp_dir}/*.h)
-	list(APPEND cpp_src ${cpp_hdr})
-endif()
+#if (WIN32)
+#  file(GLOB cpp_hdr ${cpp_dir}/*.h)
+#	list(APPEND cpp_src ${cpp_hdr})
+#endif()
 
-add_library(cryptopp STATIC ${cpp_src})
+#add_library(cryptopp STATIC ${cpp_src})