diff --git a/dev-db/libpg_query/Manifest b/dev-db/libpg_query/Manifest
index c9fff90e81..a9f7907b85 100644
--- a/dev-db/libpg_query/Manifest
+++ b/dev-db/libpg_query/Manifest
@@ -1 +1 @@
-DIST libpg_query-5.1.0.gh.tar.gz 4296325 BLAKE2B 0f4e80b7ad18462cdcfe8feb6fb8ddf17b0c90f96e6951d46103a1e6c5110e4a383a4742b38b3b3e1eea0fad9a1107cc1a69b296cd0890f342be8e89304d2856 SHA512 01b03c51f19bed427d1e3c0eecfe1ad8af0fcbce175e08b3fc53ba2a2cac396b85db9bc294e01ca7d0b3032d4fd966d95b3771d8133bb71fe3578a7beb6c587d
+DIST libpg_query-16.5.1.0.gh.tar.gz 4296325 BLAKE2B 0f4e80b7ad18462cdcfe8feb6fb8ddf17b0c90f96e6951d46103a1e6c5110e4a383a4742b38b3b3e1eea0fad9a1107cc1a69b296cd0890f342be8e89304d2856 SHA512 01b03c51f19bed427d1e3c0eecfe1ad8af0fcbce175e08b3fc53ba2a2cac396b85db9bc294e01ca7d0b3032d4fd966d95b3771d8133bb71fe3578a7beb6c587d
diff --git a/dev-db/libpg_query/libpg_query-5.1.0.ebuild b/dev-db/libpg_query/libpg_query-16.5.1.0.ebuild
similarity index 65%
rename from dev-db/libpg_query/libpg_query-5.1.0.ebuild
rename to dev-db/libpg_query/libpg_query-16.5.1.0.ebuild
index e7b7ac52cb..bb9c746e30 100644
--- a/dev-db/libpg_query/libpg_query-5.1.0.ebuild
+++ b/dev-db/libpg_query/libpg_query-16.5.1.0.ebuild
@@ -3,26 +3,34 @@
 
 EAPI=8
 
-PG_TARGET="16"
-MY_PV="${PG_TARGET}-${PV}"
+MY_PV="${PV/16\./16-}"
 DESCRIPTION="C library for accessing the PostgreSQL parser outside of the server environment"
 HOMEPAGE="https://github.com/pganalyze/libpg_query"
 SRC_URI="https://github.com/pganalyze/libpg_query/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
-SLOT="0/${PG_TARGET}"
+SLOT="0/16"
 KEYWORDS="~amd64"
-IUSE="examples"
+IUSE="examples static-libs"
 
 BDEPEND="
 	dev-libs/protobuf-c
 	dev-libs/xxhash
 "
 
+src_prepare() {
+	default
+
+	if ! use static-libs; then
+		sed -i -e "s/^install: \$(ARLIB) \$(SOLIB)$/install: \$(SOLIB)/" "${S}"/Makefile || die
+		sed -i -e "/^	\$(INSTALL) -m 644 \$(ARLIB) \"\$(DESTDIR)\"\$(libdir)\/\$(ARLIB)$/d" "${S}"/Makefile || die
+	fi
+}
+
 src_compile() {
-	emake build
 	emake build_shared
+	use static-libs && emake build
 	use examples && emake examples
 }