diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 982c3cc98..f1b5d62d9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -156,7 +156,8 @@ ENDIF( UNIX )
 
 
 IF(GLOOX_FOUND)
-    ADD_SUBDIRECTORY( xmppbot )
+  SET( tomahawkHeaders ${tomahawkHeaders} xmppbot/xmppbot.h )
+  SET( tomahawkSources ${tomahawkSources} xmppbot/xmppbot.cpp )
 ENDIF(GLOOX_FOUND)
 ADD_SUBDIRECTORY( sip )
 
@@ -192,12 +193,11 @@ MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" )
 
 SET(LINK_LIBRARIES  "")
 IF(LIBLASTFM_FOUND)
-    SET(LINK_LIBRARIES
-        ${LINK_LIBRARIES}
-        ${LIBLASTFM_LIBRARY}
-    )
+    SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${LIBLASTFM_LIBRARY} )
 ENDIF(LIBLASTFM_FOUND)
-
+IF(GLOOX_FOUND)
+    SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${GLOOX_LIBRARIES} )
+ENDIF(GLOOX_FOUND)
 
 TARGET_LINK_LIBRARIES( tomahawk
     ${LINK_LIBRARIES}
diff --git a/src/config.h.in b/src/config.h.in
index b265c2198..8a8d1807d 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -6,6 +6,8 @@
 #cmakedefine SNOW_LEOPARD
 #cmakedefine LEOPARD
 #cmakedefine HAVE_SPARKLE
+
 #cmakedefine LIBLASTFM_FOUND
+#cmakedefine GLOOX_FOUND
 
 #endif // CONFIG_H_IN
diff --git a/src/xmppbot/CMakeLists.txt b/src/xmppbot/CMakeLists.txt
deleted file mode 100644
index e593e2e4b..000000000
--- a/src/xmppbot/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-SET( tomahawkHeaders ${tomahawkHeaders}
-    xmppbot.h
-)
-
-SET( tomahawkSources ${tomahawkSources}
-    xmppbot.cpp
-)
\ No newline at end of file