diff --git a/CMakeLists.txt b/CMakeLists.txt
index 273496f10..a2d2bf237 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,13 @@ endif()
 # Path to put keymaps
 set(FREERDP_KEYMAP_PATH "${CMAKE_INSTALL_PREFIX}/freerdp/keymaps")
 
+# Build CUnit
+find_package(CUnit)
+if(CUNIT_FOUND)
+   add_subdirectory(cunit)
+endif()
+
 # Libraries
-add_subdirectory(cunit)
 add_subdirectory(include)
 add_subdirectory(libfreerdp-asn1)
 add_subdirectory(libfreerdp-utils)
diff --git a/cmake/FindCUnit.cmake b/cmake/FindCUnit.cmake
new file mode 100644
index 000000000..a510546af
--- /dev/null
+++ b/cmake/FindCUnit.cmake
@@ -0,0 +1,47 @@
+# - Find CUnit
+# Find the CUnit libraries
+#
+#  This module defines the following variables:
+#     CUNIT_FOUND        - True if CUNIT_INCLUDE_DIR & CUNIT_LIBRARY are found
+#     CUNIT_LIBRARIES    - Set when CUNIT_LIBRARY is found
+#     CUNIT_INCLUDE_DIRS - Set when CUNIT_INCLUDE_DIR is found
+#
+#     CUNIT_INCLUDE_DIR  - where to find CUnit.h, etc.
+#     CUNIT_LIBRARY      - the cunit library
+#
+
+#=============================================================================
+# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+find_path(CUNIT_INCLUDE_DIR NAMES CUnit.h
+          PATH_SUFFIXES CUnit
+          DOC "The CUnit include directory"
+)
+
+find_library(CUNIT_LIBRARY NAMES cunit
+          DOC "The CUnit library"
+)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CUNIT DEFAULT_MSG CUNIT_LIBRARY CUNIT_INCLUDE_DIR)
+
+if(CUNIT_FOUND)
+  set( CUNIT_LIBRARIES ${CUNIT_LIBRARY} )
+  set( CUNIT_INCLUDE_DIRS ${CUNIT_INCLUDE_DIR} )
+endif()
+
+mark_as_advanced(CUNIT_INCLUDE_DIR CUNIT_LIBRARY)
diff --git a/cunit/CMakeLists.txt b/cunit/CMakeLists.txt
index 7da4cc5b0..44d11ba0c 100644
--- a/cunit/CMakeLists.txt
+++ b/cunit/CMakeLists.txt
@@ -17,6 +17,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+include_directories(${CUNIT_INCLUDE_DIRS})
+
 include_directories(.)
 include_directories(../include)
 include_directories(../libfreerdp-gdi)
@@ -31,7 +33,7 @@ add_executable(test_freerdp
 	test_freerdp.c
 	test_freerdp.h)
 
-target_link_libraries(test_freerdp cunit)
+target_link_libraries(test_freerdp ${CUNIT_LIBRARIES})
 
 target_link_libraries(test_freerdp freerdp-gdi)
 target_link_libraries(test_freerdp freerdp-asn1)