diff --git a/daemon/udp_listener.c b/daemon/udp_listener.c
new file mode 100644
index 000000000..961cc8177
--- /dev/null
+++ b/daemon/udp_listener.c
@@ -0,0 +1,45 @@
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "udp_listener.h"
+#include "poller.h"
+#include "aux.h"
+
+static void udp_listener_closed(int fd, void *p, uintptr_t x) {
+	abort();
+}
+
+int udp_listener_init(struct udp_listener *u, struct poller *p, struct in6_addr ip, u_int16_t port, poller_func_t func, struct obj *obj) {
+	struct sockaddr_in6 sin;
+	struct poller_item i;
+
+	u->fd = socket(AF_INET6, SOCK_DGRAM, 0);
+	if (u->fd == -1)
+		return -1;
+
+	nonblock(u->fd);
+	reuseaddr(u->fd);
+	ipv6only(u->fd, 0);
+
+	ZERO(sin);
+	sin.sin6_family = AF_INET6;
+	sin.sin6_addr = ip;
+	sin.sin6_port = htons(port);
+	if (bind(u->fd, (struct sockaddr *) &sin, sizeof(sin)))
+		goto fail;
+
+	ZERO(i);
+	i.fd = u->fd;
+	i.closed = udp_listener_closed;
+	i.readable = func;
+	i.obj = obj;
+	if (poller_add_item(p, &i))
+		goto fail;
+
+fail:
+	close(u->fd);
+	return -1;
+}
diff --git a/daemon/udp_listener.h b/daemon/udp_listener.h
new file mode 100644
index 000000000..1a989cdb5
--- /dev/null
+++ b/daemon/udp_listener.h
@@ -0,0 +1,17 @@
+#ifndef _UDP_LISTENER_H_
+#define _UDP_LISTENER_H_
+
+#include "poller.h"
+
+
+struct poller;
+struct obj;
+
+struct udp_listener {
+	int fd;
+	struct poller *poller;
+};
+
+int udp_listener_init(struct udp_listener *, struct poller *p, struct in6_addr ip, u_int16_t port, poller_func_t, struct obj *);
+
+#endif