diff --git a/openrc/conf.d/gollum b/contrib/openrc/conf.d/gollum
similarity index 100%
rename from openrc/conf.d/gollum
rename to contrib/openrc/conf.d/gollum
diff --git a/openrc/init.d/gollum b/contrib/openrc/init.d/gollum
similarity index 100%
rename from openrc/init.d/gollum
rename to contrib/openrc/init.d/gollum
diff --git a/contrib/systemd/gollum@.service b/contrib/systemd/gollum@.service
new file mode 100644
index 00000000..1761f650
--- /dev/null
+++ b/contrib/systemd/gollum@.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Gollum wiki server
+After=network.target
+
+[Service]
+Type=simple
+User=%i
+ExecStart=/usr/bin/gollum
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/gollum.gemspec b/gollum.gemspec
index ae5947c6..e22b77f6 100644
--- a/gollum.gemspec
+++ b/gollum.gemspec
@@ -538,8 +538,9 @@ Gem::Specification.new do |s|
     licenses/css_tree_menu_thecssninja/license.txt
     licenses/licenses.txt
     licenses/unity_asset_pool/COPYRIGHT
-    openrc/conf.d/gollum
-    openrc/init.d/gollum
+    contrib/openrc/conf.d/gollum
+    contrib/openrc/init.d/gollum
+    contrib/systemd/gollum@.service
   ]
   # = MANIFEST =