diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95d0e6fcc..25ecbd2b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,6 +229,11 @@ macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://gith
 macro_optional_find_package(LibLastFm 1.0.0)
 macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/lastfm/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
 
+if( UNIX )
+    macro_optional_find_package(AccountsQt 1.6)
+    macro_log_feature(ACCOUNTSQT_FOUND "AccountsQt" "The Accounts-Qt library provides a storage solution for user accounts." "https://code.google.com/p/accounts-sso" TRUE "" "Accounts-Qt is needed for account creation and retrieval on platforms that use the Accounts & SSO framework as a system-wide account storage solution.")
+endif( UNIX )
+
 # we need pthreads too
 macro_optional_find_package(Threads)
 macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
diff --git a/CMakeModules/FindAccountsQt.cmake b/CMakeModules/FindAccountsQt.cmake
new file mode 100644
index 000000000..18bda5dbc
--- /dev/null
+++ b/CMakeModules/FindAccountsQt.cmake
@@ -0,0 +1,27 @@
+# - Try to find AccountsQt
+# Once done this will define
+#  ACCOUNTSQT_FOUND - System has libaccounts-qt
+#  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
+#  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
+#
+#  Copyright 2013 by Alejandro Fiestas Olivares <afiestas@kde.org>
+ 
+find_package(PkgConfig)
+
+find_path(ACCOUNTSQT_INCLUDE_DIR Accounts/Account
+          HINTS ${ACCOUNTSQT_INCLUDEDIR} ${ACCOUNTSQT_INCLUDE_DIRS} ${CMAKE_INSTALL_PREFIX}/include
+          PATH_SUFFIXES accounts-qt )
+
+find_library(ACCOUNTSQT_LIBRARY NAMES accounts-qt libaccounts-qt
+    HINTS ${ACCOUNTSQT_LIBDIR} ${ACCOUNTSQT_LIBRARY_DIRS} ${CMAKE_INSTALL_PREFIX}/lib64)
+
+set(ACCOUNTSQT_LIBRARIES ${ACCOUNTSQT_LIBRARY} )
+set(ACCOUNTSQT_INCLUDE_DIRS ${ACCOUNTSQT_INCLUDE_DIR} )
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set  ACCOUNTSQT_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(libaccounts-qt  DEFAULT_MSG
+                                  ACCOUNTSQT_LIBRARY ACCOUNTSQT_INCLUDE_DIR)
+
+mark_as_advanced(ACCOUNTSQT_INCLUDE_DIR ACCOUNTSQT_LIBRARY )