diff --git a/CMakeLists.txt b/CMakeLists.txt
index 297498430..ddc3fa895 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,7 @@ pkg_check_modules(INDICATEQT indicate-qt)
 pkg_check_modules(SPOTIFY libspotify>=10.1.16)
 pkg_check_modules(CDIO libcdio)
 pkg_check_modules(QCA qca2)
+pkg_check_modules(CHROMAPRINT libchromaprint)
 
 if (WIN32)
   find_package(ZLIB REQUIRED)
@@ -355,6 +356,13 @@ if(GMOCK_INCLUDE_DIRS)
   endif(GTEST_INCLUDE_DIRS)
 endif(GMOCK_INCLUDE_DIRS)
 
+# Use our 3rdparty chromaprint if a system one wasn't found
+if(NOT CHROMAPRINT_FOUND)
+  add_subdirectory(3rdparty/chromaprint)
+  set(CHROMAPRINT_LIBRARIES chromaprint_p)
+  set(CHROMAPRINT_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/3rdparty/chromaprint/src)
+endif(NOT CHROMAPRINT_FOUND)
+
 # Subdirectories
 add_subdirectory(src)
 if (WIN32)
@@ -365,7 +373,6 @@ add_subdirectory(3rdparty/universalchardet)
 add_subdirectory(tests)
 add_subdirectory(dist)
 add_subdirectory(tools/ultimate_lyrics_parser)
-add_subdirectory(3rdparty/chromaprint)
 
 option(WITH_DEBIAN OFF)
 if(WITH_DEBIAN)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 70b89ae04..71d567678 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,6 +26,7 @@ include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
 include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS})
 include_directories(${QXT_INCLUDE_DIRS})
 include_directories(${ECHONEST_INCLUDE_DIRS})
+include_directories(${CHROMAPRINT_INCLUDE_DIRS})
 
 find_package(OpenGL)
 include_directories(${OPENGL_INCLUDE_DIR})
@@ -960,8 +961,8 @@ add_dependencies(clementine_lib pot)
 
 target_link_libraries(clementine_lib
   chardet
-  chromaprint_p
   sha2
+  ${CHROMAPRINT_LIBRARIES}
   ${ECHONEST_LIBRARIES}
   ${GOBJECT_LIBRARIES}
   ${GLIB_LIBRARIES}
diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
index 0be12c82e..25e56e189 100644
--- a/src/musicbrainz/chromaprinter.cpp
+++ b/src/musicbrainz/chromaprinter.cpp
@@ -22,7 +22,7 @@
 #include <QtDebug>
 #include <QTime>
 
-#include "3rdparty/chromaprint/src/chromaprint.h"
+#include <chromaprint.h>
 
 #include "core/logging.h"
 #include "core/timeconstants.h"