--- a/libnsfb-0.0.2/Makefile
+++ b/libnsfb-0.0.2/Makefile
@@ -32,16 +32,41 @@
 endif 
 
 ifeq ($(NSFB_XCB_AVAILABLE),yes)
-  $(eval $(call pkg_config_package_min_version,NSFB_XCB_NEW_API,xcb,0.23))
+  # Size hint allocators were removed in xcb-icccm 0.3.0
+  $(eval $(call pkg_config_package_min_version,NSFB_XCB_ICCCM_SIZE_HINTS,xcb-icccm,0.3.0))
+  ifeq ($(NSFB_XCB_ICCCM_SIZE_HINTS),yes)
+    CFLAGS := $(CFLAGS) -DNSFB_NEED_HINTS_ALLOC
+  endif
+
+  # xcb-icccm 0.3.8 introduced an additional "icccm_" in function names
+  $(eval $(call pkg_config_package_min_version,NSFB_XCB_ICCCM_API_PREFIX,xcb-icccm,0.3.8))
+  ifeq ($(NSFB_XCB_ICCCM_API_PREFIX),yes)
+    CFLAGS := $(CFLAGS) -DNSFB_NEED_ICCCM_API_PREFIX
+  endif
 
-  ifeq ($(NSFB_XCB_NEW_API),yes)
-    CFLAGS := $(CFLAGS) -DNEED_HINTS_ALLOC
+  # xcbproto 1.6 incorporated atoms previously found in xcb_atom
+  # However, libxcb <1.3 did not report xcbproto versions. Assume xcbproto 1.5 in this case.
+  $(eval $(call pkg_config_package_min_version,NSFB_HAVE_MODERN_XCB,xcb,1.3))
+  ifeq ($(NSFB_HAVE_MODERN_XCB),yes)
+    $(eval $(call pkg_config_get_variable,NSFB_XCBPROTO_VERSION,xcb,xcbproto_version))
+    NSFB_XCBPROTO_MAJOR_VERSION := $(word 1,$(subst ., ,$(NSFB_XCBPROTO_VERSION)))
+    NSFB_XCBPROTO_MINOR_VERSION := $(word 2,$(subst ., ,$(NSFB_XCBPROTO_VERSION)))
+    CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MAJOR_VERSION=$(NSFB_XCBPROTO_MAJOR_VERSION)
+    CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MINOR_VERSION=$(NSFB_XCBPROTO_MINOR_VERSION)
+  else
+    CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MAJOR_VERSION=1
+    CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MINOR_VERSION=5
   endif
 
   $(eval $(call pkg_config_package_add_flags,$(NSFB_XCB_PKG_NAMES),CFLAGS))
   $(eval $(call pkg_config_package_add_flags,$(NSFB_XCB_PKG_NAMES),TESTCFLAGS,TESTLDFLAGS))
 
   REQUIRED_PKGS := $(REQUIRED_PKGS) $(NSFB_XCB_PKG_NAMES)
+
+  $(eval $(call pkg_config_package_available,NSFB_XCB_UTIL_AVAILABLE,xcb-util))
+  ifeq ($(NSFB_XCB_UTIL_AVAILABLE),yes)
+    REQUIRED_PKGS := $(REQUIRED_PKGS) xcb-util
+  endif
 endif
 
 ifeq ($(NSFB_VNC_AVAILABLE),yes)
--- a/libnsfb-0.0.2/src/surface/x.c
+++ b/libnsfb-0.0.2/src/surface/x.c
@@ -33,7 +33,7 @@
 #include "plot.h"
 #include "cursor.h"
 
-#if defined(NEED_HINTS_ALLOC)
+#if defined(NSFB_NEED_HINTS_ALLOC)
 static xcb_size_hints_t *
 xcb_alloc_size_hints(void)
 {
@@ -47,6 +47,17 @@
 }
 #endif
 
+#if defined(NSFB_NEED_ICCCM_API_PREFIX)
+#define xcb_size_hints_set_max_size xcb_icccm_size_hints_set_max_size
+#define xcb_size_hints_set_min_size xcb_icccm_size_hints_set_min_size
+#define xcb_set_wm_size_hints       xcb_icccm_set_wm_size_hints
+#endif
+
+#if (NSFB_XCBPROTO_MAJOR_VERSION > 1) || \
+    (NSFB_XCBPROTO_MAJOR_VERSION == 1 && NSFB_XCBPROTO_MINOR_VERSION >= 6)
+#define WM_NORMAL_HINTS XCB_ATOM_WM_NORMAL_HINTS
+#endif
+
 #define X_BUTTON_LEFT 1
 #define X_BUTTON_MIDDLE 2
 #define X_BUTTON_RIGHT 3
--- a/libnsfb-0.0.2/build/makefiles/Makefile.pkgconfig
+++ b/libnsfb-0.0.2/build/makefiles/Makefile.pkgconfig
@@ -24,7 +24,7 @@
     $$(error pkg-config is required to auto-detect package version)
   endif
 
-  $(1) := $$(shell $$(PKGCONFIG) --version $(2))
+  $(1) := $$(shell $$(PKGCONFIG) --modversion $(2))
 
 endef
 
@@ -86,3 +86,15 @@
 
 endef
 
+# Obtain the value of a pkg-config variable
+# 1: Name of variable to assign result into
+# 2: Name of package to search for
+# 3: Name of pkg-config variable to retrieve
+define pkg_config_get_variable
+  ifeq ($$(PKGCONFIG),)
+    $$(error pkg-config is required to auto-detect package version)
+  endif
+
+  $(1) := $$(shell $$(PKGCONFIG) --variable=$(3) $(2))
+
+endef