diff --git a/packages/net-misc/htpdate/files/htpdate.conf b/packages/net-misc/htpdate/files/openrc/confd/htpdate
similarity index 100%
rename from packages/net-misc/htpdate/files/htpdate.conf
rename to packages/net-misc/htpdate/files/openrc/confd/htpdate
diff --git a/packages/net-misc/htpdate/files/htpdate.init-r1 b/packages/net-misc/htpdate/files/openrc/initd/htpdate
similarity index 100%
rename from packages/net-misc/htpdate/files/htpdate.init-r1
rename to packages/net-misc/htpdate/files/openrc/initd/htpdate
diff --git a/packages/net-misc/htpdate/htpdate-1.1.3.exheres-0 b/packages/net-misc/htpdate/htpdate-1.1.3-r1.exheres-0
similarity index 87%
rename from packages/net-misc/htpdate/htpdate-1.1.3.exheres-0
rename to packages/net-misc/htpdate/htpdate-1.1.3-r1.exheres-0
index e2bc259c..77048fe0 100644
--- a/packages/net-misc/htpdate/htpdate-1.1.3.exheres-0
+++ b/packages/net-misc/htpdate/htpdate-1.1.3-r1.exheres-0
@@ -1,6 +1,8 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+require openrc-service [ openrc_confd_files=[ "${FILES}"/openrc/confd ] ]
+
 SUMMARY="Synchronize local workstation with time offered by remote webservers"
 HOMEPAGE="http://www.vervest.org/fiki/bin/view/HTP/DownloadC"
 DOWNLOADS="http://www.vervest.org/htp/archive/c/${PNV}.tar.gz"
@@ -26,7 +28,6 @@ src_install() {
     doman htpdate.8
     dodoc README Changelog
 
-    newconfd "${FILES}"/htpdate.conf htpdate
-    newinitd "${FILES}"/htpdate.init-r1 htpdate
+    install_openrc_files
 }