diff --git a/net-misc/clatd/clatd-1.6.ebuild b/net-misc/clatd/clatd-1.6-r1.ebuild
similarity index 90%
rename from net-misc/clatd/clatd-1.6.ebuild
rename to net-misc/clatd/clatd-1.6-r1.ebuild
index 8787d907e5..98f2aea63c 100644
--- a/net-misc/clatd/clatd-1.6.ebuild
+++ b/net-misc/clatd/clatd-1.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit systemd
+inherit prefix systemd
 
 DESCRIPTION="A CLAT / SIIT-DC Edge Relay implementation for Linux"
 HOMEPAGE="https://github.com/toreanderson/clatd"
@@ -25,6 +25,11 @@ RDEPEND="
 "
 BEPEND="${COMMON_DEPEND}"
 
+src_prepare() {
+	hprefixify scripts/clatd.systemd clatd
+	default
+}
+
 src_compile() {
 	pod2man --name clatd --center "clatd - a CLAT implementation for Linux" \
 	--section 8 README.pod > clatd.8 || die
diff --git a/net-misc/clatd/clatd-2.1.0.ebuild b/net-misc/clatd/clatd-2.1.0.ebuild
index ea8e969ebb..7e9faf9870 100644
--- a/net-misc/clatd/clatd-2.1.0.ebuild
+++ b/net-misc/clatd/clatd-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit systemd
+inherit prefix systemd
 
 DESCRIPTION="A CLAT / SIIT-DC Edge Relay implementation for Linux"
 HOMEPAGE="https://github.com/toreanderson/clatd"
@@ -25,6 +25,11 @@ RDEPEND="
 "
 BEPEND="${COMMON_DEPEND}"
 
+src_prepare() {
+	hprefixify scripts/clatd.systemd clatd
+	default
+}
+
 src_compile() {
 	pod2man --name clatd --center "clatd - a CLAT implementation for Linux" \
 	--section 8 README.pod > clatd.8 || die