diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index c048ba9c3a609..852f38455aebc 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2016/04/11 19:01:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2016/08/26 13:59:34 mef Exp $
 #
 
 DISTNAME=	yaz-4.1.6
-PKGREVISION=	18
+DISTNAME=	yaz-5.16.0
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/
 
@@ -22,6 +22,8 @@ USE_TOOLS+=	pkg-config tclsh
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.libiconv}
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--with-xml2=${BUILDLINK_PREFIX.libxml2}
+# backtrace and backtrace_symbols
+LDFLAGS+=	-lexecinfo
 
 PTHREAD_OPTS+=	native optional
 
diff --git a/net/yaz/PLIST b/net/yaz/PLIST
index ce3ad63085789..ebc75ba6e49d4 100644
--- a/net/yaz/PLIST
+++ b/net/yaz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2011/02/03 12:39:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2016/08/26 13:59:34 mef Exp $
 bin/yaz-asncomp
 bin/yaz-client
 bin/yaz-config
@@ -7,13 +7,17 @@ bin/yaz-icu
 bin/yaz-illclient
 bin/yaz-json-parse
 bin/yaz-marcdump
+bin/yaz-url
 bin/yaz-ztest
 bin/zoomsh
 include/yaz/backend.h
+include/yaz/backtrace.h
+include/yaz/base64.h
 include/yaz/ccl.h
 include/yaz/ccl_xml.h
 include/yaz/charneg.h
 include/yaz/comstack.h
+include/yaz/cookie.h
 include/yaz/copy_types.h
 include/yaz/cql.h
 include/yaz/daemon.h
@@ -75,8 +79,10 @@ include/yaz/timing.h
 include/yaz/tokenizer.h
 include/yaz/tpath.h
 include/yaz/unix.h
+include/yaz/url.h
 include/yaz/wrbuf.h
 include/yaz/xmalloc.h
+include/yaz/xml_get.h
 include/yaz/xml_include.h
 include/yaz/xmlquery.h
 include/yaz/xmltypes.h
@@ -129,6 +135,7 @@ man/man1/yaz-icu.1
 man/man1/yaz-illclient.1
 man/man1/yaz-json-parse.1
 man/man1/yaz-marcdump.1
+man/man1/yaz-url.1
 man/man1/zoomsh.1
 man/man7/bib1-attr.7
 man/man7/yaz-log.7
@@ -140,6 +147,7 @@ share/doc/yaz/asn.external.html
 share/doc/yaz/asn.html
 share/doc/yaz/asn.pdu.html
 share/doc/yaz/asn.preparing.html
+share/doc/yaz/bib1-diagnostics.html
 share/doc/yaz/bib1.html
 share/doc/yaz/common/id.png
 share/doc/yaz/common/style1.css
@@ -153,6 +161,7 @@ share/doc/yaz/comstack.server.html
 share/doc/yaz/comstack.ssl.html
 share/doc/yaz/comstack.summary.html
 share/doc/yaz/credits.html
+share/doc/yaz/facets.html
 share/doc/yaz/future.html
 share/doc/yaz/index.html
 share/doc/yaz/indexdata.html
@@ -180,6 +189,8 @@ share/doc/yaz/soap.html
 share/doc/yaz/soap.http.html
 share/doc/yaz/soap.srw.html
 share/doc/yaz/soap.xml.html
+share/doc/yaz/sorting.html
+share/doc/yaz/sru-diagnostics.html
 share/doc/yaz/tools.html
 share/doc/yaz/tools.log.html
 share/doc/yaz/tools.nmem.html
@@ -194,6 +205,7 @@ share/doc/yaz/yaz-illclient.html
 share/doc/yaz/yaz-json-parse.html
 share/doc/yaz/yaz-log.html
 share/doc/yaz/yaz-marcdump.html
+share/doc/yaz/yaz-url.html
 share/doc/yaz/yaz-ztest.html
 share/doc/yaz/yaz.html
 share/doc/yaz/zoom.events.html
@@ -202,6 +214,7 @@ share/doc/yaz/zoom.facets.html
 share/doc/yaz/zoom.html
 share/doc/yaz/zoom.options.html
 share/doc/yaz/zoom.query.html
+share/doc/yaz/zoom.queryconversions.html
 share/doc/yaz/zoom.records.html
 share/doc/yaz/zoom.resultsets.html
 share/doc/yaz/zoom.scan.html
diff --git a/net/yaz/distinfo b/net/yaz/distinfo
index 515d8c30cae5e..11c05e81e295d 100644
--- a/net/yaz/distinfo
+++ b/net/yaz/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.28 2015/11/04 00:35:47 agc Exp $
+$NetBSD: distinfo,v 1.29 2016/08/26 13:59:34 mef Exp $
 
-SHA1 (yaz-4.1.6.tar.gz) = 2c370b246c571d79b2fd8221b80eb99362cee0c8
-RMD160 (yaz-4.1.6.tar.gz) = 635caf0538254fd8b7e3be2a9cbd12c294fbfc38
-SHA512 (yaz-4.1.6.tar.gz) = df1c6fad3c34b5f1ed0fa49ee1d3f66943afa0f36b3988781048bd11ff65b813d9726a9dd2624ff52dbcf489c4566f8bd5eb1fdd1a63509d2053c07398860d4e
-Size (yaz-4.1.6.tar.gz) = 2253206 bytes
+SHA1 (yaz-5.16.0.tar.gz) = ed9def5455afa20b8ad2dcb51dff5219a8ba5f80
+RMD160 (yaz-5.16.0.tar.gz) = 90da21fd1c94c24c3614b1c1a2bcbbddcc7de38c
+SHA512 (yaz-5.16.0.tar.gz) = 61314083f7068696870280d5b3fa0fda7b81bc885c440d38a54bb09a8252750fa29e7873e273f15492c774d8a65093ffc2f38a60e7900cbd68a4f9895921ff01
+Size (yaz-5.16.0.tar.gz) = 2586095 bytes