diff --git a/initsys/systemd/fedmsg-gateway.service b/initsys/systemd/fedmsg-gateway.service
new file mode 100644
index 00000000..50f55509
--- /dev/null
+++ b/initsys/systemd/fedmsg-gateway.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Outbound fedmsg gateway
+After=sockets.target
+Documentation=http://fedmsg.readthedocs.org/en/latest/commands/
+
+[Service]
+ExecStart=/usr/bin/fedmsg-gateway
+Type=simple
+User=fedmsg
+Group=fedmsg
+
+[Install]
+WantedBy=multi-user.target
diff --git a/initsys/systemd/fedmsg-hub.service b/initsys/systemd/fedmsg-hub.service
new file mode 100644
index 00000000..334798be
--- /dev/null
+++ b/initsys/systemd/fedmsg-hub.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Generic fedmsg processing hub
+After=sockets.target
+Documentation=http://fedmsg.readthedocs.org/en/latest/commands/
+
+[Service]
+ExecStart=/usr/bin/fedmsg-hub
+Type=simple
+User=fedmsg
+Group=fedmsg
+
+[Install]
+WantedBy=multi-user.target
diff --git a/initsys/systemd/fedmsg-irc.service b/initsys/systemd/fedmsg-irc.service
new file mode 100644
index 00000000..64c21e34
--- /dev/null
+++ b/initsys/systemd/fedmsg-irc.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=IRC bot for fedmsg
+After=sockets.target
+Documentation=http://fedmsg.readthedocs.org/en/latest/commands/
+
+[Service]
+ExecStart=/usr/bin/fedmsg-irc
+Type=simple
+User=fedmsg
+Group=fedmsg
+
+[Install]
+WantedBy=multi-user.target
diff --git a/initsys/systemd/fedmsg-relay.service b/initsys/systemd/fedmsg-relay.service
new file mode 100644
index 00000000..7e4c1bd6
--- /dev/null
+++ b/initsys/systemd/fedmsg-relay.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=fedmsg active<->passive relay
+After=sockets.target
+Documentation=http://fedmsg.readthedocs.org/en/latest/commands/
+
+[Service]
+ExecStart=/usr/bin/fedmsg-relay
+Type=simple
+User=fedmsg
+Group=fedmsg
+
+[Install]
+WantedBy=multi-user.target
diff --git a/initsys/systemd/fedmsg-tweet.service b/initsys/systemd/fedmsg-tweet.service
new file mode 100644
index 00000000..71b5e5d9
--- /dev/null
+++ b/initsys/systemd/fedmsg-tweet.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Twitter/Identi.ca bot for fedmsg
+After=sockets.target
+Documentation=http://fedmsg.readthedocs.org/en/latest/commands/
+
+[Service]
+ExecStart=/usr/bin/fedmsg-tweet
+Type=simple
+User=fedmsg
+Group=fedmsg
+
+[Install]
+WantedBy=multi-user.target
diff --git a/init.d/fedmsg-gateway.init b/initsys/sysv/fedmsg-gateway.init
similarity index 100%
rename from init.d/fedmsg-gateway.init
rename to initsys/sysv/fedmsg-gateway.init
diff --git a/init.d/fedmsg-hub.init b/initsys/sysv/fedmsg-hub.init
similarity index 100%
rename from init.d/fedmsg-hub.init
rename to initsys/sysv/fedmsg-hub.init
diff --git a/init.d/fedmsg-irc.init b/initsys/sysv/fedmsg-irc.init
similarity index 100%
rename from init.d/fedmsg-irc.init
rename to initsys/sysv/fedmsg-irc.init
diff --git a/init.d/fedmsg-relay.init b/initsys/sysv/fedmsg-relay.init
similarity index 100%
rename from init.d/fedmsg-relay.init
rename to initsys/sysv/fedmsg-relay.init
diff --git a/init.d/fedmsg-tweet.init b/initsys/sysv/fedmsg-tweet.init
similarity index 100%
rename from init.d/fedmsg-tweet.init
rename to initsys/sysv/fedmsg-tweet.init