diff --git a/dist/fedora/etc/entrydns/unicorn.conf b/dist/fedora/etc/entrydns/unicorn.conf
index f50a8c6..3e7cc94 100644
--- a/dist/fedora/etc/entrydns/unicorn.conf
+++ b/dist/fedora/etc/entrydns/unicorn.conf
@@ -1,11 +1,11 @@
 #
 # Configuration file for Unicorn app server for EntryDNS serving
 #
-worker_processes 2
+worker_processes 1
 working_directory "/srv/entrydns"
 listen 8081
 pid "/run/entrydns/unicorn.pid"
-user entrydns, entrydns
+user "entrydns", "entrydns"
 
 stdout_path "/var/log/entrydns/unicorn_stdout.log"
 stderr_path "/var/log/entrydns/unicorn_stderr.log"
diff --git a/dist/fedora/lib/systemd/system/unicorn-entrydns.service b/dist/fedora/lib/systemd/system/unicorn-entrydns.service
new file mode 100644
index 0000000..785492a
--- /dev/null
+++ b/dist/fedora/lib/systemd/system/unicorn-entrydns.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Unicorn application server for EntryDNS
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=simple
+EnvironmentFile=/etc/sysconfig/unicorn-entrydns
+PIDFile=/run/entrydns/unicorn.pid
+ExecStart=/usr/bin/bundle exec 'unicorn -c /etc/entrydns/unicorn.conf'
+ExecReload=/usr/bin/kill -HUP ${MAINPID}
+ExecStop=/usr/bin/kill -QUIT ${MAINPID}
+
+[Install]
+WantedBy=multi-user.target
+