diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 222f78e1504b..7f95709b1712 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -1,53 +1,52 @@
 # Created by: Dmitry Sivachenko <dima@Chg.RU>
 
 PORTNAME=	yaz
-DISTVERSION=	5.30.3
-PORTREVISION=	2
+DISTVERSION=	5.31.0
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Z39.50/SR client and API library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libgnutls.so:security/gnutls
 
 USES=		gnome iconv libtool ncurses pathfix pkgconfig readline \
 		shebangfix tcl
-SHEBANG_FILES=	util/yaz-asncomp
+SHEBANG_FILES=	src/yaz-asncomp
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CONFIGURE_ARGS=	--enable-shared --with-iconv=${ICONV_PREFIX} \
 		--with-xml2=${LOCALBASE} --with-xslt=${LOCALBASE} \
 		--with-icu=${LOCALBASE} --enable-tcpd
 LDFLAGS+=	-L${LOCALBASE}/lib
 LIBS+=		-lexecinfo
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS MEMCACHED REDIS
 
 MEMCACHED_DESC=		Memcached distributed cache system support
 MEMCACHED_CONFIGURE_WITH=	memcached
 MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 REDIS_CONFIGURE_WITH=	redis
 REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 
 post-patch:
 	@${REINPLACE_CMD} 's|tclsh |tclsh8.6 |' ${WRKSRC}/configure
 
 post-configure:
 	@${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/man,' \
 		${WRKSRC}/doc/Makefile
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
 
 .include <bsd.port.mk>
diff --git a/net/yaz/distinfo b/net/yaz/distinfo
index 1071b1efa7d1..60b8a5947add 100644
--- a/net/yaz/distinfo
+++ b/net/yaz/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595105475
-SHA256 (yaz-5.30.3.tar.gz) = f0497fd8420574efab4e5738ea3b70787a6e8042f585156baa30bdc1911ba552
-SIZE (yaz-5.30.3.tar.gz) = 2615643
+TIMESTAMP = 1619626693
+SHA256 (yaz-5.31.0.tar.gz) = 864d4476d1578ac132782b3d4e2eb96391bd88f7ae3040ddcb1556aba6fe0d15
+SIZE (yaz-5.31.0.tar.gz) = 2599598