diff --git a/srcpkgs/cairo/cairo-devel.template b/srcpkgs/cairo/cairo-devel.template
index 63bfe4b6f8..eec59cb4ab 100644
--- a/srcpkgs/cairo/cairo-devel.template
+++ b/srcpkgs/cairo/cairo-devel.template
@@ -5,24 +5,21 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=2
-
 Add_dependency run zlib-devel
 Add_dependency run fontconfig-devel
 Add_dependency run freetype-devel
 Add_dependency run pixman-devel
+Add_dependency run glib-devel
 Add_dependency run libpng-devel
 Add_dependency run libX11-devel
-Add_dependency run libxcb-devel
-Add_dependency run xcb-util-devel
 Add_dependency run libXrender-devel
 Add_dependency run cairo
 
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/{bin,include} ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/{cairo,pkgconfig} ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
 }
diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index 25ee2e37a7..dce9c564fa 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -1,16 +1,14 @@
 # Template build file for 'cairo'.
 pkgname=cairo
-version=1.8.10
-revision=3
+version=1.10.0
 distfiles="http://cairographics.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--enable-xlib=yes --enable-xlib-xrender=yes
- --enable-xcb=yes --enable-png=yes --disable-glitz
- --enable-directfb=no --enable-ft=yes --enable-pdf=yes
+ --enable-png=yes --enable-directfb=no --enable-ft=yes --enable-pdf=yes
  --enable-ps=yes --enable-svg=yes --disable-gcov"
 short_desc="Vector graphics library with cross-device output support"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
+checksum=0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2
 long_desc="
  Cairo is a vector graphics library with cross-device output support. Currently
  supported output targets include the X Window System and in-memory image
@@ -29,11 +27,10 @@ Add_dependency run zlib
 Add_dependency run fontconfig
 Add_dependency run freetype
 Add_dependency run pixman
+Add_dependency run glib
 Add_dependency run libpng
 Add_dependency run libX11
 Add_dependency run libXrender
-Add_dependency run xcb-util
-Add_dependency run libxcb
 Add_dependency build pkg-config
 Add_dependency build zlib-devel
 Add_dependency build fontconfig-devel
@@ -41,11 +38,4 @@ Add_dependency build freetype-devel
 Add_dependency build pixman-devel
 Add_dependency build libpng-devel
 Add_dependency build libX11-devel
-Add_dependency build xcb-util-devel
-Add_dependency build libxcb-devel
 Add_dependency build libXrender-devel
-
-pre_configure()
-{
-	sed -i -e "s|libpng12|libpng14|g" ${wrksrc}/configure
-}