diff --git a/.travis.yml b/.travis.yml
index d889d565..f618c1e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ addons:
       - &clang
         - libstdc++-5-dev
       - &base_deps
+        - libxcb-composite0-dev
         - libxcb-ewmh-dev
         - libxcb-icccm4-dev
         - libxcb-image0-dev
diff --git a/cmake/02-opts.cmake b/cmake/02-opts.cmake
index a044c4f0..4a2e1cbe 100644
--- a/cmake/02-opts.cmake
+++ b/cmake/02-opts.cmake
@@ -45,7 +45,7 @@ option(WITH_XRANDR_MONITORS "xcb-randr monitor support" ON)
 option(WITH_XRENDER "xcb-render support" OFF)
 option(WITH_XDAMAGE "xcb-damage support" OFF)
 option(WITH_XSYNC "xcb-sync support" OFF)
-option(WITH_XCOMPOSITE "xcb-composite support" OFF)
+option(WITH_XCOMPOSITE "xcb-composite support" ON)
 option(WITH_XKB "xcb-xkb support" ON)
 option(WITH_XRM "xcb-xrm support" ON)
 option(WITH_XCURSOR "xcb-cursor support" ON)
diff --git a/include/x11/extensions/all.hpp b/include/x11/extensions/all.hpp
index a805192f..9fcf9c82 100644
--- a/include/x11/extensions/all.hpp
+++ b/include/x11/extensions/all.hpp
@@ -14,9 +14,7 @@
 #if WITH_XSYNC
 #include "x11/extensions/sync.hpp"
 #endif
-#if WITH_XCOMPOSITE
 #include "x11/extensions/composite.hpp"
-#endif
 #if WITH_XKB
 #include "x11/extensions/xkb.hpp"
 #endif
diff --git a/src/x11/extensions/composite.cpp b/src/x11/extensions/composite.cpp
index 09a2bb6e..d008ee55 100644
--- a/src/x11/extensions/composite.cpp
+++ b/src/x11/extensions/composite.cpp
@@ -8,14 +8,12 @@ namespace composite_util {
   /**
    * Query for the XCOMPOSITE extension
    */
-  void query_extension(connection&) {
-#if 0
+  void query_extension(connection& conn) {
     conn.composite().query_version(XCB_COMPOSITE_MAJOR_VERSION, XCB_COMPOSITE_MINOR_VERSION);
 
     if (!conn.extension<xpp::composite::extension>()->present) {
       throw application_error("Missing X extension: Composite");
     }
-#endif
   }
 }