diff --git a/CMakeLists.txt b/CMakeLists.txt
index 329a5e19b..74accf273 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,20 +38,7 @@ ELSE()
 	INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDE_DIRS})
 ENDIF()
 
-SET(LIBDCDEVEL "" CACHE STRING "libraries")
-IF(DEFINED LIBDCDEVEL)
-	cmake_policy(SET CMP0015 OLD)
-	include_directories(${LIBDCDEVEL}/include )
-	link_directories(${LIBDCDEVEL}/src/.libs)
-	if(NOT DEFINED LIBDCSTATIC)
-		set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -ldivecomputer -lusb-1.0)
-	ELSE()
-		set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} libdivecomputer.a -lusb-1.0)
-	ENDIF()
-ELSE()
-	set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -ldivecomputer)
-ENDIF()
-
+FIND_PACKAGE(Libdivecomputer REQUIRED)
 FIND_PACKAGE(Marble REQUIRED)
 include_directories(${MARBLE_INCLUDE_DIR})
 
diff --git a/cmake/Modules/FindLibdivecomputer.cmake b/cmake/Modules/FindLibdivecomputer.cmake
new file mode 100644
index 000000000..07e36f21f
--- /dev/null
+++ b/cmake/Modules/FindLibdivecomputer.cmake
@@ -0,0 +1,35 @@
+# - Try to find the LIBDIVECOMPUTER Library
+# Once done this will define
+#
+#  LIBDIVECOMPUTER_FOUND - system has LIBDIVECOMPUTER
+#  LIBDIVECOMPUTER_INCLUDE_DIR - the LIBDIVECOMPUTER include directory
+#  LIBDIVECOMPUTER_LIBRARIES
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+# in cache already
+IF ( LIBDIVECOMPUTER_INCLUDE_DIR AND LIBDIVECOMPUTER_LIBRARIES )
+   SET( LIBDIVECOMPUTER_FIND_QUIETLY TRUE )
+ENDIF ( LIBDIVECOMPUTER_INCLUDE_DIR AND LIBDIVECOMPUTER_LIBRARIES )
+
+FIND_PATH( LIBDIVECOMPUTER_INCLUDE_DIR
+NAMES libdivecomputer/hw.h
+HINTS
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/
+    /usr/local/include
+    /usr/include
+)
+
+FIND_LIBRARY( LIBDIVECOMPUTER_LIBRARIES
+NAMES
+    libdivecomputer.a
+    divecomputer
+HINTS
+    ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/src/.libs/
+    /usr/local/include
+    /usr/include
+)
+
+INCLUDE( FindPackageHandleStandardArgs )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( Libdivecomputer DEFAULT_MSG LIBDIVECOMPUTER_INCLUDE_DIR LIBDIVECOMPUTER_LIBRARIES )