diff --git a/roles/radvd/handlers/main.yml b/roles/radvd/handlers/main.yml
new file mode 100644
index 0000000..37e9f4d
--- /dev/null
+++ b/roles/radvd/handlers/main.yml
@@ -0,0 +1,6 @@
+---
+
+- name: Restart radvd
+  service: name={{ item }} state=restarted
+  with_items:
+   - radvd
diff --git a/roles/radvd/tasks/main.yml b/roles/radvd/tasks/main.yml
new file mode 100644
index 0000000..b7d997f
--- /dev/null
+++ b/roles/radvd/tasks/main.yml
@@ -0,0 +1,18 @@
+---
+
+- name: Install radvd
+  apt: name={{ item }}
+  with_items:
+   - radvd
+
+- name: Configure radvd
+  template: src={{ item }}.j2 dest=/etc/{{ item }}
+  tags: radvd
+  notify: Restart radvd
+  with_items:
+   - radvd.conf
+
+- name: Start the radvd service
+  service: name={{ item }} state=started enabled=yes
+  with_items:
+   - radvd
diff --git a/roles/radvd/templates/radvd.conf.j2 b/roles/radvd/templates/radvd.conf.j2
new file mode 100644
index 0000000..e769ec7
--- /dev/null
+++ b/roles/radvd/templates/radvd.conf.j2
@@ -0,0 +1,15 @@
+interface br-{{ site_code }} {
+  AdvSendAdvert on;
+  IgnoreIfMissing on;
+  AdvManagedFlag off;
+  AdvOtherConfigFlag on;
+  MaxRtrAdvInterval 200;
+  AdvLinkMTU {{ mtu }};
+  prefix {{ batman_ipv6 | ipaddr('address') | ipsubnet(64) }}
+    AdvOnLink on;
+    AdvAutonomous on;
+    AdvRouterAddr on;
+  };
+  RDNSS {{ batman_ipv6 | ipaddr('address')}} {
+  };
+};
diff --git a/site.yml b/site.yml
index 88c304d..f7244a8 100644
--- a/site.yml
+++ b/site.yml
@@ -10,16 +10,17 @@
 - name: Setup gateway servers
   hosts: [gw11.regensburg.freifunk.net, gw21.regensburg.freifunk.net, gw31.regensburg.freifunk.net]
   roles:
-  - batman
-  - bird
-  - fastd
-  - mesh-interfaces
-  - exit-ipv4
-  - dns
-  - dhcpd
-  - respondd
-  - yanic
-  - web-gw
+#  - batman
+#  - bird
+#  - fastd
+#  - mesh-interfaces
+#  - exit-ipv4
+#  - dns
+   - radvd
+#  - dhcpd
+#  - respondd
+#  - yanic
+#  - web-gw
 
 - name: Setup confluence server
   hosts: confluence.regensburg.freifunk.net