diff --git a/templates/cairo-devel b/templates/cairo-devel
new file mode 120000
index 0000000000..cae58ed676
--- /dev/null
+++ b/templates/cairo-devel
@@ -0,0 +1 @@
+cairo
\ No newline at end of file
diff --git a/templates/cairo/cairo-doc-public-Makefile-in.diff b/templates/cairo/cairo-doc-public-Makefile-in.diff
deleted file mode 100644
index 5366413f8a..0000000000
--- a/templates/cairo/cairo-doc-public-Makefile-in.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/public/Makefile.in.orig	2008-10-02 21:51:38.000000000 +0200
-+++ doc/public/Makefile.in	2008-10-02 21:51:46.000000000 +0200
-@@ -1022,8 +1022,6 @@
- 	  done; \
- 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
- 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
--	  which gtkdoc-rebase >/dev/null && \
--	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
- 	fi
- 
- uninstall-local:
diff --git a/templates/cairo/depends b/templates/cairo/depends
new file mode 100644
index 0000000000..98c9e30a4a
--- /dev/null
+++ b/templates/cairo/depends
@@ -0,0 +1,2 @@
+abi_depends=1.8.6
+api_depends=${abi_depends}
diff --git a/templates/cairo/devel.template b/templates/cairo/devel.template
new file mode 100644
index 0000000000..16d9f4e46d
--- /dev/null
+++ b/templates/cairo/devel.template
@@ -0,0 +1,18 @@
+# Template file for 'cairo-devel'.
+#
+short_desc="${sourcepkg} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run cairo
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+}
diff --git a/templates/cairo/template b/templates/cairo/template
index 83e8129d28..c20a978884 100644
--- a/templates/cairo/template
+++ b/templates/cairo/template
@@ -1,16 +1,16 @@
 # Template build file for 'cairo'.
 pkgname=cairo
-version=1.7.6
-patch_files="$pkgname-doc-public-Makefile-in.diff"
-distfiles="http://cairographics.org/snapshots/$pkgname-$version.tar.gz"
+sourcepkg=$pkgname
+version=1.8.6
+distfiles="http://cairographics.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
-configure_args="--enable-glitz --enable-pdf --enable-ps"
-pkgconfig_override="cairo.pc cairo-ft.pc cairo-glitz.pc cairo-pdf.pc
- cairo-ps.pc cairo-svg.pc cairo-xlib-xrender.pc cairo-xlib.pc"
+configure_args="--enable-xlib=yes --enable-xlib-xrender=yes
+ --enable-xcb=yes --enable-png=yes --enable-glitz=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=b78d4d3b9f83c667b8322eed95f8bd9bb0e1b039
+checksum=93a347af0cecf258be8fb54265b16a0fb16317df4a32896141d2987c30773535
 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
@@ -22,3 +22,16 @@ long_desc="
  1.4 imaging model. Cairo provides operations including stroking and filling
  Bezier cubic splines, transforming and compositing translucent images, and
  antialiased text rendering."
+
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency full glibc
+Add_dependency full zlib
+Add_dependency full libpng
+Add_dependency full fontconfig
+Add_dependency full freetype
+Add_dependency full pixman
+Add_dependency full glitz
+Add_dependency full xcb-util
+Add_dependency full libX11
+Add_dependency full libXrender