diff --git a/packages/graphics/cairo/build b/packages/graphics/cairo/build
index 5d8d8b0c54..af4011dca8 100755
--- a/packages/graphics/cairo/build
+++ b/packages/graphics/cairo/build
@@ -2,23 +2,73 @@
 
 . config/options $1
 
+# cairo fails to build with graphite support
+# see also http://bugs.gentoo.org/336157
+  CFLAGS=`echo $CFLAGS | sed -e "s|-ftree-loop-distribution||"`
+  CFLAGS=`echo $CFLAGS | sed -e "s|-floop-interchange||"`
+  CFLAGS=`echo $CFLAGS | sed -e "s|-floop-strip-mine||"`
+  CFLAGS=`echo $CFLAGS | sed -e "s|-floop-block||"`
+  CFLAGS=`echo $CFLAGS | sed -e "s|-fgraphite-identity||"`
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
+            --x-includes="$SYSROOT_PREFIX/usr/include" \
+            --x-libraries="$SYSROOT_PREFIX/usr/lib" \
+            --disable-silent-rules \
             --enable-shared \
+            --disable-static \
+            --disable-gtk-doc \
+            --enable-largefile \
+            --enable-atomic \
+            --disable-gcov \
+            --disable-valgrind \
+            --enable-xlib \
+            --enable-xlib-xrender \
+            --disable-xcb \
+            --disable-xlib-xcb \
+            --disable-xcb-shm \
+            --disable-qt \
+            --disable-quartz \
+            --disable-quartz-font \
+            --disable-quartz-image \
+            --disable-win32 \
+            --disable-win32-font \
+            --disable-skia \
+            --disable-os2 \
+            --disable-beos \
+            --disable-drm \
+            --disable-drm-xr \
+            --disable-gallium \
+            --disable-xcb-drm \
             --enable-png \
+            --enable-gl \
+            --disable-directfb \
+            --disable-vg \
+            --disable-egl \
+            --enable-glx \
+            --disable-wgl \
+            --disable-script \
+            --enable-ft \
+            --enable-fc \
             --enable-ps \
             --enable-pdf \
             --enable-svg \
-            --enable-xlib \
-            --disable-xcb \
-            --disable-gl \
-            --disable-drm \
-            --disable-gtk-doc \
+            --disable-test-surfaces \
+            --disable-tee \
+            --disable-xml \
+            --enable-pthread \
+            --disable-gobject \
+            --disable-full-testing \
+            --disable-trace \
+            --enable-interpreter \
+            --disable-symbol-lookup \
+            --enable-some-floating-point \
+            --with-gnu-ld \
+            --with-x
 
 make
 $MAKEINSTALL
diff --git a/packages/graphics/cairo/meta b/packages/graphics/cairo/meta
index b06188565a..40009b8522 100644
--- a/packages/graphics/cairo/meta
+++ b/packages/graphics/cairo/meta
@@ -5,8 +5,8 @@ PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://cairographics.org/"
 PKG_URL="http://cairographics.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="zlib freetype fontconfig libpng pixman libXrender libX11"
-PKG_BUILD_DEPENDS="toolchain zlib freetype fontconfig libpng pixman libXrender libX11"
+PKG_DEPENDS="zlib freetype fontconfig libpng pixman libXrender libX11 Mesa"
+PKG_BUILD_DEPENDS="toolchain zlib freetype fontconfig libpng pixman libXrender libX11 Mesa"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
 PKG_SHORTDESC="cairo: Multi-platform 2D graphics library"