diff --git a/dev-db/libpg_query/Manifest b/dev-db/libpg_query/Manifest
index a9f7907b85..624596e24c 100644
--- a/dev-db/libpg_query/Manifest
+++ b/dev-db/libpg_query/Manifest
@@ -1 +1,2 @@
 DIST libpg_query-16.5.1.0.gh.tar.gz 4296325 BLAKE2B 0f4e80b7ad18462cdcfe8feb6fb8ddf17b0c90f96e6951d46103a1e6c5110e4a383a4742b38b3b3e1eea0fad9a1107cc1a69b296cd0890f342be8e89304d2856 SHA512 01b03c51f19bed427d1e3c0eecfe1ad8af0fcbce175e08b3fc53ba2a2cac396b85db9bc294e01ca7d0b3032d4fd966d95b3771d8133bb71fe3578a7beb6c587d
+DIST libpg_query-17.6.0.0.gh.tar.gz 4497708 BLAKE2B a7aafc7e9969b20d9b3f58cdb3cc23f3a003496f247874a9689cd24a87a22b8a102da1b8800f33fc21556356a151bda1f86cb300af150607aece8be5b6679eec SHA512 235adfe708fda313c00b7a3795a1da54c9a2503c153e67f69df2a1529a36e40aaeb77f5cb36117e7e3b176fa467a3e33b8ddbd8c145f83c7f0fa99e1ad995ee8
diff --git a/dev-db/libpg_query/libpg_query-17.6.0.0.ebuild b/dev-db/libpg_query/libpg_query-17.6.0.0.ebuild
new file mode 100644
index 0000000000..a86368889d
--- /dev/null
+++ b/dev-db/libpg_query/libpg_query-17.6.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV/\./-}"
+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/16"
+KEYWORDS="~amd64"
+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_shared
+	use static-libs && emake build
+	use examples && emake examples
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake \
+		prefix="${ED}"/usr \
+		libdir="${ED}/usr/$(get_libdir)" \
+		install
+}