diff --git a/roles/mirrormanager/mirrorlist2/files/mirrorlist-server.service b/roles/mirrormanager/mirrorlist2/files/mirrorlist-server.service
new file mode 100644
index 0000000000..f4932e18bd
--- /dev/null
+++ b/roles/mirrormanager/mirrorlist2/files/mirrorlist-server.service
@@ -0,0 +1,5 @@
+.include /usr/lib/systemd/system/mirrorlist-server.service
+[Service]
+# systemd needs an empty ExecStart= to be able to overwrite ExecStart=
+ExecStart=
+ExecStart=/usr/bin/python2 /usr/share/mirrormanager2/mirrorlist_server.py --debug -l /var/log/mirrormanager/mirrorlist.log
diff --git a/roles/mirrormanager/mirrorlist2/handlers/main.yml b/roles/mirrormanager/mirrorlist2/handlers/main.yml
new file mode 100644
index 0000000000..3d8bee041e
--- /dev/null
+++ b/roles/mirrormanager/mirrorlist2/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: reload systemd service files
+  command: systemctl daemon-reload
diff --git a/roles/mirrormanager/mirrorlist2/tasks/main.yml b/roles/mirrormanager/mirrorlist2/tasks/main.yml
index e0dee54162..2cf504e321 100644
--- a/roles/mirrormanager/mirrorlist2/tasks/main.yml
+++ b/roles/mirrormanager/mirrorlist2/tasks/main.yml
@@ -80,5 +80,16 @@
         owner=root group=root mode=0755
   tags:
   - hotfix
+
+- name: make a /var/log/mirrormanager dir for logs
+  file: dest=/var/log/mirrormanager/ state=directory owner=mirrormanager group=mirrormanager mode=0755
+  tags:
+  - mirrorlist2
+
+- name: copy systemd service file in for mirrorlist-server
+  copy: src=mirrorlist-server.service dest=/etc/systemd/system/mirrorlist-server.service
   notify:
+  - reload systemd service files
   - restart mirrorlist-server
+  tags:
+  - mirrorlist2