diff --git a/awesome.c b/awesome.c
index 4e0775f80..326cf77b6 100644
--- a/awesome.c
+++ b/awesome.c
@@ -276,15 +276,15 @@ xerror(void *data __attribute__ ((unused)),
     /* ignore this */
     if(e->error_code == XCB_EVENT_ERROR_BAD_WINDOW
        || (e->error_code == XCB_EVENT_ERROR_BAD_MATCH
-           && XCB_EVENT_REQUEST_TYPE(e) == XCB_SET_INPUT_FOCUS)
+           && e->major_code == XCB_SET_INPUT_FOCUS)
        || (e->error_code == XCB_EVENT_ERROR_BAD_VALUE
-           && XCB_EVENT_REQUEST_TYPE(e) == XCB_KILL_CLIENT)
-       || (XCB_EVENT_REQUEST_TYPE(e) == XCB_CONFIGURE_WINDOW
+           && e->major_code == XCB_KILL_CLIENT)
+       || (e->major_code == XCB_CONFIGURE_WINDOW
            && e->error_code == XCB_EVENT_ERROR_BAD_MATCH))
         return 0;
 
     warn("X error: request=%s, error=%s",
-         xcb_event_get_request_label(XCB_EVENT_REQUEST_TYPE(e)),
+         xcb_event_get_request_label(e->major_code),
          xcb_event_get_error_label(e->error_code));
 
     return 0;
diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake
index 9f1e96475..867083d4c 100644
--- a/awesomeConfig.cmake
+++ b/awesomeConfig.cmake
@@ -129,7 +129,7 @@ execute_process(
 
 # Use pkgconfig to get most of the libraries
 pkg_check_modules(AWESOME_COMMON_REQUIRED REQUIRED
-    xcb>=1.1)
+    xcb>=1.4)
 
 pkg_check_modules(AWESOME_REQUIRED REQUIRED
     glib-2.0
@@ -140,7 +140,7 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED
     xcb-randr
     xcb-xtest
     xcb-xinerama
-    xcb-event>=0.3.4
+    xcb-event>=0.3.6
     xcb-aux>=0.3.0
     xcb-atom>=0.3.0
     xcb-keysyms>=0.3.4