diff --git a/net-misc/clockspeed/clockspeed-0.62-r9.ebuild b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild
index ff6856a5012ee..795bbec63e2d4 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r9.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-r9.ebuild
@@ -30,9 +30,15 @@ PATCHES=(
 )
 
 src_configure() {
+	append-cflags -std=gnu17 # XXX https://bugs.gentoo.org/946519, workaround for gcc15
+
 	echo "$(tc-getCC) ${CFLAGS} ${ASFLAGS}" > conf-cc || die
 	use static && append-ldflags -static
 	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+	sed -i \
+		-e "s:^echo 'ar cr :echo '$(tc-getAR) cr :g" \
+		-e "s:^  echo 'ranlib :  echo '$(tc-getRANLIB) :g" \
+		make-makelib.sh || die
 }
 
 src_install() {
diff --git a/net-misc/clockspeed/metadata.xml b/net-misc/clockspeed/metadata.xml
index 2c98407046f3e..498248f969d4e 100644
--- a/net-misc/clockspeed/metadata.xml
+++ b/net-misc/clockspeed/metadata.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-clockspeed uses a hardware tick counter to compensate for a persistently fast or
-slow system clock. Given a few time measurements from a reliable source, it
-computes and then eliminates the clock skew. 
-</longdescription>
+	<maintainer type="person" proxied="yes">
+		<email>zhixu.liu@gmail.com</email>
+		<name>Z. Liu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	clockspeed uses a hardware tick counter to compensate for a persistently fast or
+	slow system clock. Given a few time measurements from a reliable source, it
+	computes and then eliminates the clock skew.
+	</longdescription>
 </pkgmetadata>