diff --git a/dev-db/timescaledb/Manifest b/dev-db/timescaledb/Manifest
index 559c1e7..261cc9f 100644
--- a/dev-db/timescaledb/Manifest
+++ b/dev-db/timescaledb/Manifest
@@ -1,2 +1,2 @@
-DIST timescaledb-2.16.1.tar.gz 7449327 BLAKE2B 4eac0f41596db1b7669850cbb576a2d710998f7207f566fb9b4965804e6810f1571d18058a126acdae7862bf77424db44f27720f3600d1191ae1a3c3cf8680ae SHA512 4972ccc385a3c7bda8fab8736c63f75c5b290a3a0206add84718326fcd07c24a52dbbae2114e857fb78246bf5a4b5ec3310cc2219a163af4d5f30f1766e37fae
 DIST timescaledb-2.17.2.tar.gz 7567447 BLAKE2B c2d5d9883377ffce57184c9c29413d12a41c7ef7891abb088aa72d0d7c410db28370c53585d7ec286fd52b3fe5c89b10f3b6deb547b6a1de132dc9c6697aa8cb SHA512 fc74d41062735bd4136ac71b0e10aecf34a64cdb29fd2ff31eae3f406beb8db00866e8ed7e142d47852e1586a6ad2ffa1652fbd792a45e995174b62464963d1e
+DIST timescaledb-2.18.1.tar.gz 7903462 BLAKE2B d52814524f485593973c671cbdf5ed7c81bcbb5d4b9df1cfdc0a5b27edbc1a8b35d28feda786f9b1137bc986d2efed797be1b347e2204626d2251c0b7df5f7ae SHA512 94d6d10b8b74a55211d8767887962f5c37bc1ecd4dcc13fa8740904a9503d885ff635d0c93c56a5b3daacddf882f16f89f3d0afe50bc351e9abb8015cc537efb
diff --git a/dev-db/timescaledb/timescaledb-2.16.1.ebuild b/dev-db/timescaledb/timescaledb-2.16.1.ebuild
deleted file mode 100644
index 314250e..0000000
--- a/dev-db/timescaledb/timescaledb-2.16.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-POSTGRES_COMPAT=( {14..16} )
-POSTGRES_USEDEP="ssl"
-
-inherit cmake postgres-multi
-
-DESCRIPTION="Open-source time-series SQL database"
-HOMEPAGE="https://www.timescale.com/"
-SRC_URI="https://github.com/timescale/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0
-	tsl? ( timescale )"
-SLOT="0"
-IUSE="+tsl"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	postgres-multi_src_prepare
-	postgres-multi_foreach cmake_src_prepare
-}
-
-src_configure() {
-	pg_src_configure () {
-		local mycmakeargs=(
-			-DAPACHE_ONLY=$(usex tsl OFF ON)
-			-DWARNINGS_AS_ERRORS=OFF
-			-DSEND_TELEMETRY_DEFAULT=OFF
-			-DREGRESS_CHECKS=OFF
-			-DPG_CONFIG=${PG_CONFIG}
-		)
-		cmake_src_configure
-	}
-	postgres-multi_foreach pg_src_configure
-}
-
-src_compile() {
-	postgres-multi_foreach cmake_src_compile
-}
-
-src_install() {
-	postgres-multi_foreach cmake_src_install
-
-	find "${ED}" -name '*.a' -delete
-}
diff --git a/dev-db/timescaledb/timescaledb-2.18.1.ebuild b/dev-db/timescaledb/timescaledb-2.18.1.ebuild
new file mode 100644
index 0000000..b57cff0
--- /dev/null
+++ b/dev-db/timescaledb/timescaledb-2.18.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+POSTGRES_COMPAT=( {14..17} )
+POSTGRES_USEDEP="ssl"
+
+inherit postgres-multi cmake
+
+DESCRIPTION="Open-source time-series SQL database"
+HOMEPAGE="https://www.timescale.com/"
+SRC_URI="https://github.com/timescale/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0
+	tsl? ( timescale )"
+SLOT=0
+KEYWORDS="~amd64"
+IUSE="+tsl"
+
+RESTRICT="test"
+
+DEPEND="${POSTGRES_DEP}"
+RDEPEND="${DEPEND}"
+
+timescale_src_prepare() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_prepare
+}
+
+src_prepare() {
+	postgres-multi_src_prepare
+	postgres-multi_foreach timescale_src_prepare
+}
+
+timescale_configure() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	local mycmakeargs=(
+		-DAPACHE_ONLY=$(usex tsl OFF ON)
+		-DWARNINGS_AS_ERRORS=OFF
+		-DSEND_TELEMETRY_DEFAULT=OFF
+		-DREGRESS_CHECKS=OFF
+		-DPG_CONFIG=${PG_CONFIG}
+	)
+	cmake_src_configure
+}
+
+src_configure() {
+	postgres-multi_foreach timescale_configure
+}
+
+timescale_src_compile() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_compile
+}
+
+src_compile() {
+	postgres-multi_foreach timescale_src_compile
+}
+
+timescale_src_install() {
+	local CMAKE_USE_DIR=$BUILD_DIR
+	cmake_src_install
+}
+
+src_install() {
+	postgres-multi_foreach timescale_src_install
+
+	find "${ED}" -name '*.a' -delete
+}