diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index f624e5e4512..d6034be236b 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -18,10 +18,10 @@ makedepends="libpng-devel fontconfig-devel pixman-devel libXrender-devel libglib
  $(vopt_if opengl MesaLib-devel) $(vopt_if gles2 MesaLib-devel)"
 
 if [ ${build_option_ultimate} ]; then
-	_ultimate_version="2015-11-30"
+	_ultimate_version="2016-04-23"
 	_ultimate_wrksrc="${XBPS_BUILDDIR}/fontconfig-ultimate-${_ultimate_version}"
 	distfiles+=" https://github.com/bohoomil/fontconfig-ultimate/archive/${_ultimate_version}.tar.gz"
-	checksum+=" e6846c4d8c51b4095f78c3588cc7ced29f0a4aa9e3a4b4aac597beca58604f21"
+	checksum+=" 9ea0e2455980be7c2ff649c1deb07838e9be64f4fad939716e0050fd5897b057"
 	post_extract() {
 		msg_normal "Applying ultimate patchset"
 		for P in ${_ultimate_wrksrc}/${pkgname}/*.patch; do
@@ -49,6 +49,6 @@ cairo-devel_package() {
 		vmove usr/include
 		vmove usr/share
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
+		vmove usr/lib/*.so
 	}
 }
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index e1093a984f6..36c8a630205 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -18,26 +18,20 @@ build_options="ultimate"
 desc_option_ultimate="Enable ultimate patchset"
 
 if [ ${build_option_ultimate} ]; then
-	_ultimate_version="2015-11-30"
+	_ultimate_version="2016-04-23"
 	_ultimate_wrksrc="${XBPS_BUILDDIR}/fontconfig-ultimate-${_ultimate_version}"
-	hostmakedepends+=" python-lxml gperf automake python"
+	hostmakedepends+=" python-lxml gperf automake libtool"
 	distfiles+=" https://github.com/bohoomil/fontconfig-ultimate/archive/${_ultimate_version}.tar.gz"
-	checksum+=" e6846c4d8c51b4095f78c3588cc7ced29f0a4aa9e3a4b4aac597beca58604f21"
-	conf_files+="
-	etc/fonts/conf.avail.infinality/combi/30-metric-aliases-combi.conf
-	etc/fonts/conf.avail.infinality/combi/37-repl-global-combi.conf
-	etc/fonts/conf.avail.infinality/combi/60-latin-combi.conf
-	etc/fonts/conf.avail.infinality/combi/65-non-latin-combi.conf
-	etc/fonts/conf.avail.infinality/combi/66-aliases-wine-combi.conf"
+	checksum+=" 9ea0e2455980be7c2ff649c1deb07838e9be64f4fad939716e0050fd5897b057"
 	post_extract() {
 		msg_normal "Applying ultimate patchset"
-		cp -r ${_ultimate_wrksrc}/conf.d.infinality/ ${wrksrc}
+		cp -r ${_ultimate_wrksrc}/conf.d.infinality ${wrksrc}
 		for P in ${_ultimate_wrksrc}/${pkgname}_patches/*.patch; do
 			patch -p1 < $P
 		done
 	}
 	pre_configure() {
-		autoreconf -f
+		autoreconf -fi
 	}
 fi
 
@@ -46,10 +40,10 @@ post_install() {
 		sed -i 's,\(Cflags: -I${includedir}\).*,\1,g' ${DESTDIR}/usr/lib/pkgconfig/fontconfig.pc
 	fi
 	if [ ${build_option_ultimate} ]; then
-		vmkdir etc/fonts/conf.avail.infinality/
-		vcopy ${_ultimate_wrksrc}/${pkgname}_patches/combi etc/fonts/conf.avail.infinality/
-		vcopy ${_ultimate_wrksrc}/${pkgname}_patches/free etc/fonts/conf.avail.infinality/
-		vcopy ${_ultimate_wrksrc}/${pkgname}_patches/ms etc/fonts/conf.avail.infinality/
+		vmkdir etc/fonts/conf.avail.infinality
+		for dir in combi free ms; do
+			vcopy ${_ultimate_wrksrc}/${pkgname}_patches/${dir} etc/fonts/conf.avail.infinality
+		done
 		vbin ${_ultimate_wrksrc}/${pkgname}_patches/fc-presets
 	fi
 }
@@ -66,7 +60,7 @@ fontconfig-devel_package() {
 		if [ ${build_option_ultimate} ]; then
 			vmkdir usr/share/doc/fontconfig/fonts-settings
 			vcopy ${_ultimate_wrksrc}/fontconfig_patches/fonts-settings/*.conf usr/share/doc/fontconfig/fonts-settings
-			vcopy ${_ultimate_wrksrc}/doc/fontconfig-infinality-ultimate/* usr/share/doc/fontconfig/
+			vcopy ${_ultimate_wrksrc}/doc/fontconfig-infinality-ultimate/* usr/share/doc/fontconfig
 		fi
 	}
 }
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 3d469a409b8..a489d00b382 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -16,19 +16,17 @@ build_options="ultimate"
 desc_option_ultimate="Enable ultimate patchset"
 
 if [ "${build_option_ultimate}" ]; then
-	_ultimate_version="2015-11-30"
-	_ultimate_wrksrc="${XBPS_BUILDDIR}/fontconfig-ultimate-${_ultimate_version}/"
+	_ultimate_version="2016-04-23"
+	_ultimate_wrksrc="${XBPS_BUILDDIR}/fontconfig-ultimate-${_ultimate_version}"
 	distfiles+=" https://github.com/bohoomil/fontconfig-ultimate/archive/${_ultimate_version}.tar.gz"
-	checksum+=" e6846c4d8c51b4095f78c3588cc7ced29f0a4aa9e3a4b4aac597beca58604f21"
-	conf_files+=" /etc/profile.d/infinality-settings.sh"
-
+	checksum+=" 9ea0e2455980be7c2ff649c1deb07838e9be64f4fad939716e0050fd5897b057"
+	conf_files="/etc/profile.d/infinality-settings.sh"
 	post_extract() {
 		msg_normal "Applying ultimate patchset\n"
 		for P in ${_ultimate_wrksrc}/${pkgname}/*.patch; do
 			patch -p1 < $P
 		done
 	}
-
 	post_install() {
 		vmkdir etc/profile.d
 		vinstall ${_ultimate_wrksrc}/${pkgname}/infinality-settings.sh 644 etc/profile.d
@@ -49,8 +47,8 @@ freetype-devel_package() {
 		for f in bin include share; do
 			vmove usr/${f}
 		done
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
 	}
 }