diff --git a/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild b/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild
index 17d16a6..3fcc7d5 100644
--- a/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild
+++ b/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild
@@ -74,7 +74,7 @@ src_configure() {
 		--with-logdir="${EPREFIX}"/var/log/${PN} \
 		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)"/${PN}/modules \
 		--without-privatelibdir \
-		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
+		--with-pidfile="${EPREFIX}"/run/${PN}.pid \
 		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
 		--with-maxconnections=1024 \
 		--with-nick-history=2000 \
@@ -85,7 +85,7 @@ src_configure() {
 		--with-system-sodium \
 		--with-system-jansson \
 		--enable-dynamic-linking \
-		--with-controlfile="${EPREFIX}"/run/${PN}/unrealircd.ctl \
+		--with-controlfile="${EPREFIX}"/run/${PN}/${PN}.ctl \
 		--enable-ssl="${EPREFIX}"/usr \
 		$(use_enable curl libcurl "${EPREFIX}"/usr) \
 		$(use_with !operoverride no-operoverride) \
@@ -123,8 +123,8 @@ src_install() {
 
 	einstalldocs
 
-	newinitd "${FILESDIR}"/${PN}.initd-r3 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r4 ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r4 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r5 ${PN}
 
 	# config should be read-only
 	fperms -R 0640 /etc/${PN}