diff --git a/roles/respondd/defaults/main.yml b/roles/respondd/defaults/main.yml
index 0125d31..12de2b9 100644
--- a/roles/respondd/defaults/main.yml
+++ b/roles/respondd/defaults/main.yml
@@ -4,4 +4,4 @@ batman_interface: bat-{{ site_code }}
 main_bridge: br-{{ site_code }}
 
 respondd_announce_git_root: https://github.com/ffnord/mesh-announce/
-respondd_announce_git_version: fc2d8d78d53d1908ad16b79b66f79557ccd9a83a
+respondd_announce_git_version: 4fd2e3e6eb15c2a52b7401c88a105ff483934689
diff --git a/roles/respondd/tasks/main.yml b/roles/respondd/tasks/main.yml
index 2b31c57..23b0ccc 100644
--- a/roles/respondd/tasks/main.yml
+++ b/roles/respondd/tasks/main.yml
@@ -7,6 +7,10 @@
   git: repo={{ respondd_announce_git_root }} dest=/opt/{{ site_code }}/respondd-announce/ version={{ respondd_announce_git_version }}
   notify: Restart respondd
 
+- name: Configure respondd
+  template: src=respondd.conf.j2 dest=/opt/{{ site_code }}/respondd.conf
+  notify: Restart respondd
+
 - name: Install systemd unit
   template: src=respondd.service.j2 dest=/lib/systemd/system/respondd.service
   notify:
diff --git a/roles/respondd/templates/respondd.conf.j2 b/roles/respondd/templates/respondd.conf.j2
new file mode 100644
index 0000000..d1382f9
--- /dev/null
+++ b/roles/respondd/templates/respondd.conf.j2
@@ -0,0 +1,20 @@
+# Default settings
+[Defaults]
+# Listen port, defaults to 1001
+Port: 1001
+# Default multicast listen addresses
+MulticastLinkAddress: ff02::2:1001
+MulticastSiteAddress: ff05::2:1001
+# Default domain to use
+DefaultDomain: {{ site_code }}
+# Default domain type
+DomainType: batadv
+
+# A domain
+[{{ site_code }}]
+# Batman interface, mandatory
+BatmanInterface: {{ batman_interface }}
+# Other listen interfaces
+Interfaces: {{ main_bridge }}
+# IPv4 gateway option for ddhcpd
+IPv4Gateway: {{ batman_ipv4 | ipaddr('address') }}
diff --git a/roles/respondd/templates/respondd.service.j2 b/roles/respondd/templates/respondd.service.j2
index eb5a7c9..931cea9 100644
--- a/roles/respondd/templates/respondd.service.j2
+++ b/roles/respondd/templates/respondd.service.j2
@@ -5,7 +5,7 @@ Description=Respondd
 After=network-online.target
 
 [Service]
-ExecStart=/opt/{{ site_code }}/respondd-announce/respondd.py -d /opt/{{ site_code }}/respondd-announce/providers -i {{ main_bridge }} -b {{ batman_interface }} -m {{ batman_ipv4 | ipaddr('address') }}
+ExecStart=/opt/{{ site_code }}/respondd-announce/respondd.py -d /opt/{{ site_code }}/respondd-announce/providers -f /opt/{{ site_code }}/respondd.conf
 Restart=always
 Environment=PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 WorkingDirectory=/opt/{{ site_code }}/respondd-announce