diff --git a/common/shlibs b/common/shlibs
index 59801575485..8cfbe437ba3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2912,6 +2912,9 @@ libortp.so.13 ortp-1.0.2_1
 libsuperlu.so.5 superlu-5.2.1_1
 libgosu.so.0 gosu-0.12.0_1
 libyara.so.3 libyara-3.5.0_1
+libyaz_icu.so.5 yaz-5.23.1_1
+libyaz.so.5 yaz-5.23.1_1
+libyaz_server.so.5 yaz-5.23.1_1
 libgcab-1.0.so.0 gcab-0.7_1
 libappstream-glib.so.8 appstream-glib-0.6.13_1
 libappstream-builder.so.8 appstream-glib-0.6.13_1
diff --git a/srcpkgs/biblioteq/template b/srcpkgs/biblioteq/template
new file mode 100644
index 00000000000..a9a57ab2e87
--- /dev/null
+++ b/srcpkgs/biblioteq/template
@@ -0,0 +1,43 @@
+# Template file for 'biblioteq'
+pkgname=biblioteq
+version=2018.07.04
+revision=1
+build_style=qmake
+configure_args="-o Makefile"
+conf_files="/etc/biblioteq.conf"
+makedepends="libpqxx-devel qt5-devel poppler-cpp-devel poppler-qt5-devel
+ sqlite-devel yaz-devel"
+short_desc="Professional cataloging and library management suite"
+maintainer="cr6git <quark6@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://textbrowser.github.io/biblioteq/"
+distfiles="https://github.com/textbrowser/biblioteq/archive/${version}.tar.gz"
+checksum=700b546152b25e0d0fa983509051952f271e0ac215e00aa9557962c0f81bf6f3
+
+case "$XBPS_TARGET_MACHINE" in
+	arm*) configure_args+=" biblioteq.arm.pro" ;;
+	*) configure_args+=" biblioteq.pro" ;;
+esac
+
+if [ -n "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-devel poppler-cpp-devel"
+fi
+
+pre_configure() {
+	sed -i -e 's|biblioteq.conf|/etc/biblioteq.conf|' \
+		-e 's/-mtune=native//' -e 's/-Werror//' biblioteq.arm.pro
+
+	sed -i -e 's|biblioteq.conf|/etc/biblioteq.conf|' \
+		-e 's/-mtune=generic//' -e 's/-Werror//' biblioteq.pro
+}
+
+do_install() {
+	## Translations must be in the same directory as BiblioteQ (executable)
+	vinstall BiblioteQ 755 usr/lib/BiblioteQ
+	vcopy Translations usr/lib/BiblioteQ
+	vinstall Icons/book.png 644 usr/share/icons
+	vconf biblioteq.conf
+	vlicense LICENSE
+	vmkdir usr/bin
+	ln -s /usr/lib/BiblioteQ/BiblioteQ ${DESTDIR}/usr/bin/biblioteq
+}
diff --git a/srcpkgs/yaz-devel b/srcpkgs/yaz-devel
new file mode 120000
index 00000000000..a021365b296
--- /dev/null
+++ b/srcpkgs/yaz-devel
@@ -0,0 +1 @@
+yaz
\ No newline at end of file
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
new file mode 100644
index 00000000000..eeb79567649
--- /dev/null
+++ b/srcpkgs/yaz/template
@@ -0,0 +1,35 @@
+# Template file for 'yaz'
+pkgname=yaz
+version=5.26.1
+revision=1
+build_style=gnu-configure
+configure_args="--enable-shared=yaz"
+hostmakedepends="bison pkg-config"
+makedepends="gnutls-devel libxslt-devel"
+short_desc="Toolkit supporting development of Z39.50/SRW/SRU clients and servers"
+maintainer="cr6git <quark6@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://www.indexdata.com/resources/software/yaz/"
+distfiles="http://ftp.indexdata.dk/pub/yaz/yaz-${version}.tar.gz"
+checksum=ceb4367e3098bce8e09734f09c0410bd679fdc3f9423bb28d70cc15cc95b66cc
+
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel"
+		LDFLAGS+=" -lexecinfo"
+		;;
+esac
+
+post_install() {
+	vlicense LICENSE
+}
+
+yaz-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+	}
+}