diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 7963ce0307..f342832737 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,31 +1,61 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
-version=2.1.25
-revision=5
+version=2.1.26
+revision=1
 short_desc="Cyrus SASL - auth daemon and administration tools"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cyrusimap.web.cmu.edu/"
 license="BSD"
-distfiles="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-$version.tar.gz"
-checksum=418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe
+distfiles="ftp://ftp.cyrusimap.org/cyrus-sasl/${pkgname}-${version}.tar.gz"
+checksum=8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3
 
-hostmakedepends="groff"
-makedepends="libressl-devel db-devel>=5.3 libldap-devel mit-krb5-devel pam-devel
- postgresql-libs-devel libmysqlclient-devel>=5.5.27 sqlite-devel"
+hostmakedepends="automake libtool groff pkg-config"
+makedepends="libsasl-devel libressl-devel db-devel>=5.3
+ libldap-devel mit-krb5-devel pam-devel sqlite-devel
+ postgresql-libs-devel libmysqlclient-devel>=5.5.27"
 depends="libsasl>=${version}"
 systemd_services="saslauthd.service on"
 
+patch_args="-Np1"
+disable_parallel_build=yes
+
+pre_configure() {
+	# XXX
+	if [ "$CROSS_BUILD" ]; then
+		sed 's,AC_TRY_RUN,AC_TRY_LINK_FUNC,' -i cmulocal/sasl2.m4
+	fi
+	rm -f config/config.guess config/config.sub
+	rm -f config/ltconfig config/ltmain.sh config/libtool.m4
+	rm -fr autom4te.cache
+	libtoolize -c
+	aclocal -I config -I cmulocal
+	automake -a -c
+	autoheader
+	autoconf
+
+	pushd saslauthd
+	rm -f config/config.guess config/config.sub
+	rm -f config/ltconfig config/ltmain.sh config/libtool.m4
+	rm -fr autom4te.cache
+	libtoolize -c
+	aclocal -I config -I ../cmulocal -I ../config
+	automake -a -c
+	autoheader
+	autoconf
+	popd
+}
 do_configure() {
-	./configure ${configure_args} --disable-static --enable-shared \
+	export CFLAGS+=" -fPIC"
+	LIBS=-lsasl2 ./configure ${configure_args} --disable-static --enable-shared \
 		--enable-alwaystrue --enable-checkapop --enable-cram \
 		--enable-digest --disable-otp --disable-srp \
 		--disable-srp-setpass --disable-krb4 --enable-gssapi \
 		--enable-auth-sasldb --enable-plain --enable-anon \
 		--enable-login --enable-ntlm --disable-passdss --enable-sql \
 		--enable-ldapdb --disable-macos-framework --with-pam \
-		--with-saslauthd=/var/run/saslauthd --with-ldap \
+		--with-saslauthd=/run/saslauthd --with-ldap \
 		--with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
-		--with-devrandom=/dev/urandom LDFLAGS=-ldb
+		--with-devrandom=/dev/urandom
 }
 
 do_build() {
diff --git a/srcpkgs/libsasl/patches/cross-makemd5.patch b/srcpkgs/libsasl/patches/cross-makemd5.patch
index 21d2c60858..fd4e522ff2 100644
--- a/srcpkgs/libsasl/patches/cross-makemd5.patch
+++ b/srcpkgs/libsasl/patches/cross-makemd5.patch
@@ -1,11 +1,12 @@
 --- a/include/Makefile.am.orig	2014-07-25 16:11:53.760645554 +0200
 +++ b/include/Makefile.am	2014-07-25 16:12:05.961050991 +0200
-@@ -49,6 +49,8 @@ saslinclude_HEADERS = hmac-md5.h md5.h m
+@@ -49,6 +49,9 @@ saslinclude_HEADERS = hmac-md5.h md5.h m
  
  noinst_PROGRAMS = makemd5
  
 +CC = cc
 +CFLAGS = -O2
++LIBS =
  makemd5_SOURCES = makemd5.c
  
  md5global.h: makemd5