diff --git a/net-misc/can-utils/can-utils-2020.12.0-r1.ebuild b/net-misc/can-utils/can-utils-2020.12.0-r1.ebuild
index 6313469107..2dafd58711 100644
--- a/net-misc/can-utils/can-utils-2020.12.0-r1.ebuild
+++ b/net-misc/can-utils/can-utils-2020.12.0-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 inherit autotools systemd
 
-DESCRIPTION="CAN userspace utilities and tools"
-HOMEPAGE="https://github.com/linux-can/"
+DESCRIPTION="SocketCAN userspace utilities and tools"
+HOMEPAGE="https://github.com/linux-can/can-utils"
 SRC_URI="https://github.com/linux-can/can-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/can-utils/can-utils-2020.12.0.ebuild b/net-misc/can-utils/can-utils-2020.12.0.ebuild
deleted file mode 100644
index a1eb63c7d7..0000000000
--- a/net-misc/can-utils/can-utils-2020.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="CAN userspace utilities and tools"
-HOMEPAGE="https://github.com/linux-can/"
-SRC_URI="https://github.com/linux-can/can-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="systemd"
-
-DEPEND=""
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-# Default src_install + newconfd and newinitd
-src_install() {
-
-	emake DESTDIR="${D}" install
-
-	einstalldocs
-
-	if use systemd ; then
-		systemd_dounit "${FILESDIR}/slcan.service"
-		systemd_install_serviced "${FILESDIR}/slcan.service.conf"
-	else
-		newconfd "${FILESDIR}/slcand.confd" slcand
-		newinitd "${FILESDIR}/slcand.initd" slcand
-	fi
-}
diff --git a/net-misc/can-utils/files/slcand.initd b/net-misc/can-utils/files/slcand.initd
index ffe08a9bf2..d4b6d92f69 100644
--- a/net-misc/can-utils/files/slcand.initd
+++ b/net-misc/can-utils/files/slcand.initd
@@ -1,6 +1,4 @@
-#!/sbin/runscript
-# Copyright 2013 Brunvoll AS
-
+#!/sbin/openrc-run
 
 start() {