diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index bb7693e1f05..d53d671be0c 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,11 +1,11 @@
 # Template file for 'couchdb'
 pkgname=couchdb
 version=1.6.1
-revision=2
+revision=3
 wrksrc="apache-couchdb-$version"
 build_style=gnu-configure
 conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang"
+hostmakedepends="erlang pkg-config"
 makedepends="libressl-devel>=2.1.4 icu-devel js-devel libcurl-devel"
 depends="erlang"
 short_desc="A document-oriented database"
@@ -15,15 +15,22 @@ homepage="http://couchdb.apache.org/"
 distfiles="http://www.eu.apache.org/dist/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
 checksum=5a601b173733ce3ed31b654805c793aa907131cd70b06d03825f169aa48c8627
 
-nocross=yes
 system_accounts="couchdb"
 couchdb_homedir="/var/lib/couchdb"
 make_dirs="
 	/var/lib/couchdb 0700 couchdb couchdb
 	/var/log/couchdb 0750 couchdb couchdb"
 
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" erlang"
+	configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+fi
+
 pre_configure() {
 	sed -i 's|-Werror||g' src/couchdb/priv/Makefile.*
+if [ "$CROSS_BUILD" ]; then
+	sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
+fi
 }
 
 post_install() {