diff --git a/roles/service-yanic/README.md b/roles/service-yanic/README.md
index c61686a..85f31b5 100644
--- a/roles/service-yanic/README.md
+++ b/roles/service-yanic/README.md
@@ -3,7 +3,7 @@
 Diese Ansible role installiert Yanic.
 
 - legt den Benutzer und Gruppe für Yanic an
-- legt das Yanic Verzeichnis aus
+- legt das Yanic Verzeichnis an
 - legt die InfluxDB Datenbank für Yanic an
 - kompiliert und installiert Yanic
 - schreibt yanic.conf
@@ -22,6 +22,8 @@ Diese Ansible role installiert Yanic.
 - Variable `yanic_user`
 - Variable `yanic_home`
 - Variable `yanic_path`
+- Variable `yanic_src`
+- Variable `yanic_dst`
 - Variable `yanic_database`
 - Variable `yanic_config`
 - Variable `respondd_config`
diff --git a/roles/service-yanic/defaults/main.yml b/roles/service-yanic/defaults/main.yml
index 7bdd472..0cf386c 100644
--- a/roles/service-yanic/defaults/main.yml
+++ b/roles/service-yanic/defaults/main.yml
@@ -3,6 +3,8 @@ yanic_user: "yanic"
 yanic_home: "/var/lib/yanic"
 yanic_path: "{{ gopath }}/bin/yanic"
 yanic_database: "yanic"
-yanic_src: "github.com/FreifunkBremen/yanic"
+yanic_src: "github.com/freifunk-mwu/yanic"
+yanic_dst: "github.com/FreifunkBremen/yanic"
+yanic_version: "mwu"
 yanic_config: "/etc/yanic.conf"
 respondd_config: "/etc/respondd.conf"
diff --git a/roles/service-yanic/tasks/main.yml b/roles/service-yanic/tasks/main.yml
index 7263d55..b546bdd 100644
--- a/roles/service-yanic/tasks/main.yml
+++ b/roles/service-yanic/tasks/main.yml
@@ -7,23 +7,23 @@
 
 - name: create source directory
   file:
-    path: "{{ gopath }}/src/{{ yanic_src }}"
+    path: "{{ gopath }}/src/{{ yanic_dst }}"
     state: directory
 
 - name: clone repository
   git:
     repo: "https://{{ yanic_src }}"
-    dest: "{{ gopath }}/src/{{ yanic_src }}"
-    version: respondd
+    dest: "{{ gopath }}/src/{{ yanic_dst }}"
+    version: "{{ yanic_version }}"
     force: true
 
 - name: ensure dependencies
-  shell: "cd {{ gopath }}/src/{{ yanic_src }} && {{ gopath }}/bin/dep ensure"
+  shell: "cd {{ gopath }}/src/{{ yanic_dst }} && {{ gopath }}/bin/dep ensure"
   environment:
     GOPATH: "{{ gopath }}"
 
 - name: build binary
-  shell: 'go install {{ gopath }}/src/{{ yanic_src }}'
+  shell: 'go install {{ gopath }}/src/{{ yanic_dst }}'
   environment:
     GOPATH: "{{ gopath }}"