diff --git a/srcpkgs/xapian-core/template b/srcpkgs/xapian-core/template
index c0b0d3191d..9fc2cc034a 100644
--- a/srcpkgs/xapian-core/template
+++ b/srcpkgs/xapian-core/template
@@ -1,38 +1,41 @@
 # Template file for 'xapian-core'
 pkgname=xapian-core
-version=1.2.19
+version=1.2.21
 revision=1
 build_style=gnu-configure
-makedepends="zlib-devel libuuid-devel"
 configure_args="--disable-static"
+makedepends="zlib-devel libuuid-devel"
 short_desc="Open source search engine"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.xapian.org/"
 license="GPL-2"
 distfiles="http://oligarchy.co.uk/xapian/${version}/${pkgname}-${version}.tar.xz"
-checksum=4a78260388ff1b042f0ab5d18afdd524a530ae609690d0339990ddc147a54785
+checksum=63f48758fbd13fa8456dd4cf9bf3ec35a096e4290f14a51ac7df23f78c162d3f
 
 # xapian-config needs the .la
 keep_libtool_archives=yes
 
+pre_configure() {
+	sed -i '/<config.h>/a#include <sys/time.h>' common/socket_utils.cc
+}
+
 xapian-core-devel_package() {
-	depends="libxapian>=${version}_${revision}"
+	depends="libxapian-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/share/doc
 		vmove usr/share/aclocal
 		vmove usr/lib/cmake
-		vmove "usr/lib/*.la"
-		vmove "usr/lib/*.so"
+		vmove usr/lib/*.la
+		vmove usr/lib/*.so
 		vmove usr/bin/xapian-config
 		vmove usr/share/man/man1/xapian-config.1
 	}
 }
-
 libxapian_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
-		vmove "usr/lib/*.so.*"
+		vmove usr/lib/*.so.*
 	}
 }