diff --git a/sys-devel/icecream/files/icecream-scheduler.service b/sys-devel/icecream/files/icecream-scheduler.service
new file mode 100644
index 0000000..bcdb127
--- /dev/null
+++ b/sys-devel/icecream/files/icecream-scheduler.service
@@ -0,0 +1,16 @@
+
+[Unit]
+Description=Icecream Distributed Compiler Scheduler
+After=network.target nss-lookup.target
+
+[Service]
+Type=simple
+# Set SHELL so that icecc-create-env does not have to attempt to detect its
+# value by reading /etc/passwd. The SELinux policy does not need to allow it.
+Environment=SHELL=/bin/bash
+SyslogIdentifier=icecc-scheduler
+ExecStart=/usr/sbin/icecc-scheduler -u icecream -v
+Nice=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-devel/icecream/files/icecream.service b/sys-devel/icecream/files/icecream.service
new file mode 100644
index 0000000..2523546
--- /dev/null
+++ b/sys-devel/icecream/files/icecream.service
@@ -0,0 +1,16 @@
+
+[Unit]
+Description=Icecream Distributed Compiler
+After=network.target nss-lookup.target
+
+[Service]
+Type=simple
+# Set SHELL so that icecc-create-env does not have to attempt to detect its
+# value by reading /etc/passwd. The SELinux policy does not need to allow it.
+Environment=SHELL=/bin/bash
+SyslogIdentifier=iceccd
+ExecStart=/usr/sbin/iceccd -u icecream -b /var/cache/icecream -v
+Nice=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-devel/icecream/icecream-1.3.1.ebuild b/sys-devel/icecream/icecream-1.3.1.ebuild
index 9ee8e0d..3b14c36 100644
--- a/sys-devel/icecream/icecream-1.3.1.ebuild
+++ b/sys-devel/icecream/icecream-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit user
+inherit user systemd
 
 MY_P="${P/icecream/icecc}"
 
@@ -47,6 +47,8 @@ src_install() {
 
 	newconfd suse/sysconfig.icecream icecream
 	newinitd "${FILESDIR}"/icecream-r2 icecream
+	systemd_newunit "${FILESDIR}/icecream-scheduler.service" 'icecream-scheduler.service'
+	systemd_newunit "${FILESDIR}/icecream.service" 'icecream.service'
 
 	insinto /etc/logrotate.d
 	newins suse/logrotate icecream