diff --git a/roles/services/handlers/main.yaml b/roles/services/handlers/main.yaml
index f96a29d..a0077b4 100644
--- a/roles/services/handlers/main.yaml
+++ b/roles/services/handlers/main.yaml
@@ -1,18 +1,18 @@
 ---
 - import_tasks: ../../common/handlers/main.yaml
 
-- name: restart irc-bot
-  systemd:
-    name: irc-bot
-    state: restarted
-    daemon_reload: true
-
 - name: restart flipdot
   systemd:
     name: flipdot
     state: restarted
     daemon_reload: true
 
+- name: restart irc-bot
+  systemd:
+    name: irc-bot
+    state: restarted
+    daemon_reload: true
+
 - name: restart siahsd
   systemd:
     name: siahsd
diff --git a/roles/services/tasks/ircbot.yaml b/roles/services/tasks/ircbot.yaml
new file mode 100644
index 0000000..9332a65
--- /dev/null
+++ b/roles/services/tasks/ircbot.yaml
@@ -0,0 +1,29 @@
+---
+- name: Clone source
+  git:
+    repo: https://github.com/bitlair/irc-bot.git
+    version: master
+    dest: /var/lib/irc-bot
+    accept_hostkey: yes
+
+- name: Link irc-say
+  file:
+    state: link
+    src: /var/lib/irc-bot/irc-say
+    dest: /usr/local/bin/irc-say
+
+- name: Install service file
+  template:
+    src: irc-bot.service
+    dest: /etc/systemd/system/irc-bot.service
+    owner: root
+    group: root
+    mode: 0644
+  notify: restart irc-bot
+
+- name: Start irc-bot
+  systemd:
+    name: irc-bot
+    state: started
+    enabled: yes
+    daemon_reload: true
diff --git a/roles/services/tasks/main.yaml b/roles/services/tasks/main.yaml
index dac2dcf..11b0285 100644
--- a/roles/services/tasks/main.yaml
+++ b/roles/services/tasks/main.yaml
@@ -1,4 +1,7 @@
 ---
+- tags: services_ircbot
+  import_tasks: ircbot.yaml
+
 - tags: services_flipdot
   import_tasks: flipdot.yaml
 
diff --git a/roles/services/templates/irc-bot.service b/roles/services/templates/irc-bot.service
new file mode 100644
index 0000000..10215b4
--- /dev/null
+++ b/roles/services/templates/irc-bot.service
@@ -0,0 +1,15 @@
+# Managed by Ansible
+
+[Unit]
+Description=Bitlair IRC bot
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/bin/bash /var/lib/irc-bot/irc-bot
+Restart=on-failure
+RestartSec=10s
+DynamicUser=true
+
+[Install]
+WantedBy=multi-user.target