diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8229f2aa0..221dfabb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,8 @@ macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVarian
 macro_optional_find_package(Taglib 1.6.0)
 macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
 
+# we need pthreads too
+find_package(Threads)
 
 FIND_PACKAGE( Taglib 1.6.0 REQUIRED )
 include( CheckTagLibFileName )
@@ -83,6 +85,9 @@ MESSAGE("add checks for libmad, libvorbis and libflac. Make sure they are instal
 MESSAGE("")
 MESSAGE("-----------------------------------------------------------------------------")
 
+# Make linking as strict on linux as it is on osx. Then we don't break linking on mac so often
+SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,--no-undefined" )
+
 ADD_SUBDIRECTORY( thirdparty )
 ADD_SUBDIRECTORY( src/libtomahawk )
 ADD_SUBDIRECTORY( src )
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 32e919eaa..2104605f0 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -398,6 +398,7 @@ target_link_libraries( tomahawklib
     ${LIBECHONEST_LIBRARY}
     ${QT_LIBRARIES}
     ${OS_SPECIFIC_LINK_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
 )
 
 install( TARGETS tomahawklib DESTINATION lib )