diff --git a/CMakeModules/FindJreen.cmake b/CMakeModules/FindJreen.cmake
index b892fdb4b..abb39f599 100644
--- a/CMakeModules/FindJreen.cmake
+++ b/CMakeModules/FindJreen.cmake
@@ -8,7 +8,7 @@
 FIND_PACKAGE(PkgConfig QUIET)
 PKG_CHECK_MODULES(PC_JREEN QUIET libjreen)
 
-FIND_PATH(LIBJREEN_INCLUDE_DIR NAMES jreen/jreen.h
+FIND_PATH(JREEN_INCLUDE_DIR NAMES jreen/jreen.h
     HINTS
         ${PC_JREEN_INCLUDEDIR}
         ${PC_JREEN_INCLUDE_DIRS}
@@ -16,7 +16,7 @@ FIND_PATH(LIBJREEN_INCLUDE_DIR NAMES jreen/jreen.h
         ${KDE4_INCLUDE_DIR}
 )
 
-FIND_LIBRARY(LIBJREEN_LIBRARY NAMES jreen
+FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen
     HINTS
         ${PC_JREEN_LIBDIR}
         ${PC_JREEN_LIBRARY_DIRS}
@@ -24,15 +24,13 @@ FIND_LIBRARY(LIBJREEN_LIBRARY NAMES jreen
         ${KDE4_LIB_DIR}
 )
 
-IF(PC_JREEN_VERSION)
-    SET(JREEN_VERSION_STRING ${PC_JREEN_VERSION})
-ELSE()
+IF(JREEN_LIBRARIES AND JREEN_INCLUDE_DIR AND NOT PC_JREEN_VERSION)
     MESSAGE(WARNING "You don't have pkg-config the Jreen version check does not work!")
 ENDIF()
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jreen
                                   REQUIRED_VARS JREEN_LIBRARIES JREEN_INCLUDE_DIR
-                                  VERSION_VAR JREEN_VERSION_STRING)
+                                  VERSION_VAR PC_JREEN_VERSION)
 
-MARK_AS_ADVANCED(JREEN_INCLUDE_DIR JREEN_LIBRARY)
+MARK_AS_ADVANCED(JREEN_INCLUDE_DIR JREEN_LIBRARIES)
diff --git a/src/accounts/xmpp/CMakeLists.txt b/src/accounts/xmpp/CMakeLists.txt
index e5e4e29ea..aaa6ce0ce 100644
--- a/src/accounts/xmpp/CMakeLists.txt
+++ b/src/accounts/xmpp/CMakeLists.txt
@@ -31,7 +31,7 @@ set( xmppAccountUI
 
 include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
    ${QT_INCLUDE_DIR}
-   ${LIBJREEN_INCLUDE_DIR}
+   ${JREEN_INCLUDE_DIR}
 )
 
 qt4_wrap_cpp( xmppAccountMoc ${xmppAccountHeaders} )
@@ -49,7 +49,7 @@ ENDIF( WIN32 )
 
 target_link_libraries( tomahawk_account_xmpp
     ${TOMAHAWK_LIBRARIES}
-    ${LIBJREEN_LIBRARY}
+    ${JREEN_LIBRARIES}
     ${QT_LIBRARIES}
     ${OS_SPECIFIC_LINK_LIBRARIES}
 )