diff --git a/sls/gentoo/init.sls b/sls/gentoo/init.sls
index 37e7bd5..318e7bc 100644
--- a/sls/gentoo/init.sls
+++ b/sls/gentoo/init.sls
@@ -2,6 +2,5 @@
 include:
   - gentoo.portage
   - gentoo.profile
-  - gentoo.openrc
   - gentoo.makeconf
 
diff --git a/sls/gentoo/openrc.sls b/sls/openrc/cronjob.sls
similarity index 50%
rename from sls/gentoo/openrc.sls
rename to sls/openrc/cronjob.sls
index 2c74e62..113f174 100644
--- a/sls/gentoo/openrc.sls
+++ b/sls/openrc/cronjob.sls
@@ -1,9 +1,8 @@
-# -*- mode: yaml -*-
-openrc:
-  pkg.latest:
-    - name: sys-apps/openrc
-  cmd.run:
-    - name: rc
+include:
+  - cron
+  - openrc
+
+openrc_rc_cron_job:
   cron.present:
     - identifier: rc
     - name: "/sbin/rc"
diff --git a/sls/openrc/init.sls b/sls/openrc/init.sls
new file mode 100644
index 0000000..e134f1e
--- /dev/null
+++ b/sls/openrc/init.sls
@@ -0,0 +1,2 @@
+include:
+  - openrc.pkg
diff --git a/sls/openrc/pkg.sls b/sls/openrc/pkg.sls
new file mode 100644
index 0000000..a1d92ea
--- /dev/null
+++ b/sls/openrc/pkg.sls
@@ -0,0 +1,4 @@
+openrc:
+  pkg.latest:
+    - pkgs:
+      - sys-apps/openrc