diff --git a/xorg/cairo/build b/xorg/cairo/build
index b0ef525a..b5ca1ab8 100755
--- a/xorg/cairo/build
+++ b/xorg/cairo/build
@@ -1,11 +1,26 @@
 #!/bin/sh -e
 
+# Disable building 'cairo-sphinx'.
+sed -i'' "s/BUILD_SPHINX_TRUE=/BUILD_SPHINX_TRUE='#'/"   configure
+sed -i'' "s/BUILD_SPHINX_FALSE='#'/BUILD_SPHINX_FALSE=/" configure
+
 ./configure \
     --prefix=/usr \
     --disable-static \
     --enable-tee \
     --enable-gl \
-    --enable-egl
+    --enable-egl \
+    --enable-xlib-xcb \
+    --enable-xcb \
+    --enable-xlib-xrender \
+    --enable-xlib \
+    --disable-trace \
+    --disable-valgrind \
+    --disable-gobject \
+    --disable-gtk-doc-html
 
 make
 make DESTDIR="$1" install
+
+# Remove GTK docs.
+rm -rf "$1/usr/share/gtk-doc"
diff --git a/xorg/cairo/depends b/xorg/cairo/depends
index ca8f5ef3..2bbb5195 100644
--- a/xorg/cairo/depends
+++ b/xorg/cairo/depends
@@ -1,7 +1,6 @@
-libX11
-libXext
 libffi
 libpng
 mesa
 pixman
 fontconfig
+xorg-server
diff --git a/xorg/cairo/version b/xorg/cairo/version
index df10ebf3..3700047c 100644
--- a/xorg/cairo/version
+++ b/xorg/cairo/version
@@ -1 +1 @@
-1.16.0 1
+1.16.0 2