diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index a436849c30c..981ca137778 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -1,7 +1,7 @@
 # Template build file for 'cairo'.
 pkgname=cairo
 version=1.14.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-lto --enable-tee
  $(vopt_if opengl '--enable-gl --enable-egl')
@@ -13,19 +13,34 @@ homepage="http://cairographics.org"
 distfiles="${homepage}/releases/$pkgname-$version.tar.xz"
 checksum=c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb
 
+desc_option_ultimate="Enable ultimate patchset"
+
 hostmakedepends="automake libtool pkg-config"
 makedepends="libpng-devel fontconfig-devel pixman-devel libXrender-devel libglib-devel
  $(vopt_if opengl MesaLib-devel) $(vopt_if gles2 MesaLib-devel)"
 
+if [ ${build_option_ultimate} ]; then
+	_ultimate_version="2015-04"
+	_ultimate_wrksrc="${XBPS_BUILDDIR}/fontconfig-ultimate-${_ultimate_version}"
+	distfiles+=" https://github.com/bohoomil/fontconfig-ultimate/archive/${_ultimate_version}.tar.gz"
+	checksum+=" e3bc9dd9c145156bd7bfa8e70c2328f47be6873da31c319bc594a5819afb8732"
+	post_extract() {
+		msg_normal "Applying ultimate patchset"
+		for P in ${_ultimate_wrksrc}/${pkgname}/*.patch; do
+			patch -p1 < $P
+		done
+	}
+fi
+
 pre_configure() {
 	autoreconf -fi
 }
 
 # Package build options
-build_options="gles2 opengl"
+build_options="gles2 opengl ultimate"
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*|x86_64*) build_options_default="opengl";;
+	i686*|x86_64*) build_options_default+=" opengl";;
 esac
 
 cairo-devel_package() {