diff --git a/cmake_modules/SwiftenConfig.cmake b/cmake_modules/SwiftenConfig.cmake
index e3737c098939bc4d015c1760ea029a44e058604d..ca806763c09b39f174936fd18cb2a0b9a2b81d39 100644
--- a/cmake_modules/SwiftenConfig.cmake
+++ b/cmake_modules/SwiftenConfig.cmake
@@ -2,9 +2,22 @@ FIND_LIBRARY(SWIFTEN_LIBRARY NAMES Swiften)
 FIND_PATH(SWIFTEN_INCLUDE_DIR NAMES "Swiften.h" PATH_SUFFIXES libSwiften Swiften )
 
 if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
-    set( SWIFTEN_INCLUDE_DIR ${SWIFTEN_INCLUDE_DIR}/.. )
-    message( STATUS "Found libSwiften: ${SWIFTEN_LIBRARY}, ${SWIFTEN_INCLUDE_DIR}")
-    set( SWIFTEN_FOUND 1 )
+	find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable")
+	set( SWIFTEN_CFLAGS "" )
+	if (SWIFTEN_CONFIG_EXECUTABLE)
+		execute_process(
+			COMMAND swiften-config --libs
+			OUTPUT_VARIABLE SWIFTEN_LIBRARY)
+		execute_process(
+			COMMAND swiften-config --cflags
+			OUTPUT_VARIABLE SWIFTEN_CFLAGS)
+		string(REGEX REPLACE "[\r\n]"                  " " SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
+		string(REGEX REPLACE " +$"                     ""  SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
+	endif()
+
+	set( SWIFTEN_INCLUDE_DIR ${SWIFTEN_INCLUDE_DIR}/.. )
+	message( STATUS "Found libSwiften: ${SWIFTEN_LIBRARY}, ${SWIFTEN_INCLUDE_DIR}")
+	set( SWIFTEN_FOUND 1 )
 else( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
     message( FATAL_ERROR "Could NOT find libSwiften" )
 endif( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )