diff --git a/CMakeLists.txt b/CMakeLists.txt
index edfd21fcc..e0c066dd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,6 +120,9 @@ macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++
 macro_optional_find_package(QCA2)
 macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions required for Grooveshark resolver" "http://delta.affinix.com/qca/" FALSE "" "")
 
+macro_optional_find_package(QtKeychain)
+macro_log_feature(QTKEYCHAIN_FOUND "QtKeychain" "Provides support for secure password storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
+
 macro_optional_find_package(LibAttica)
 macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fetching and managing of resolvers from the tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" TRUE "" "")
 
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 9e788e2be..c88e2f0c7 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -329,6 +329,8 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.
     ${LIBECHONEST_INCLUDE_DIR}/..
     ${CLUCENE_INCLUDE_DIRS}
     ${PHONON_INCLUDES}
+    ${QTKEYCHAIN_INCLUD_DIRS}
+    ${QTKEYCHAIN_INCLUD_DIRS}/..
     ${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src
 
     playlist
@@ -372,14 +374,14 @@ ENDIF( UNIX AND NOT APPLE )
 IF( WIN32 )
     SET( OS_SPECIFIC_LINK_LIBRARIES
         ${OS_SPECIFIC_LINK_LIBRARIES}
-    # System
+        # System
         "iphlpapi.a"
         "ws2_32.dll"
         "dnsapi.dll"
         "dsound.dll"
         "winmm.dll"
         "advapi32.dll"
-	"shlwapi.dll"
+        "shlwapi.dll"
     )
 ENDIF( WIN32 )
 
@@ -403,8 +405,8 @@ IF( APPLE )
         # System
         ${COREAUDIO_LIBRARY}
         ${COREFOUNDATION_LIBRARY}
-	${FOUNDATION_LIBRARY}
-	${SCRIPTINGBRIDGE_LIBRARY}
+        ${FOUNDATION_LIBRARY}
+        ${SCRIPTINGBRIDGE_LIBRARY}
 
         /System/Library/Frameworks/AppKit.framework
     )
@@ -452,8 +454,7 @@ TARGET_LINK_LIBRARIES( tomahawklib
     ${OS_SPECIFIC_LINK_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
     ${LINK_LIBRARIES}
-    -L/home/t95012/kde/lib/i386-linux-gnu/
-    qtkeychain
+    ${QTKEYCHAIN_LIBRARIES}
 )
 
 INSTALL( TARGETS tomahawklib