diff --git a/.gitignore b/.gitignore
index daf913b..273ca1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ _testmain.go
 *.exe
 *.test
 *.prof
+
+whois42d
diff --git a/README.md b/README.md
index 208d2ea..8aea9b4 100644
--- a/README.md
+++ b/README.md
@@ -43,49 +43,24 @@ it run as user nobody, who cannot bind to port 43 itself.
 
 ## Supported Queries
 
-    # mntner
-    $ whois -h <server> HAX404-MNT
+- mntner: `$ whois -h <server> HAX404-MNT`
+- person: `$ whois -h <server> HAX404-DN42`
+- aut-num: `$ whois -h <server> AS4242420429`
+- dns: `$ whois -h <server> hax404.dn42`
+- inetnum: `$ whois -h <server> 172.23.136.0/23` or `$ whois -h <server> 172.23.136.1`
+- inet6num: `$ whois -h <server> fd58:eb75:347d::/48`
+- route: `$ whois -h <server> 172.23.136.0/23`
+- route6: `$ whois -h <server> fdec:1:1:dead::/64`
+- schema: `$ whois -h <server> PERSON-SCHEMA`
+- organisation: `$ whois -h <server> ORG-C3D2`
+- tinc-keyset: `$ whois -h <server> SET-1-DN42-TINC`
+- tinc-key: `$ whois -h <server> AS4242422703`
+- as-set: `$ whois -h <server> 4242420000_4242423999`
+- as-block: `$ whois -h <server> AS-FREIFUNK`
+- route-set: `$ whois -h <server> RS-DN42-NATIVE`
 
-    # person
-    $ whois -h <server> HAX404-DN42
 
-    # aut-num
-    $ whois -h <server> AS4242420429
+## TODO
 
-    # dns
-    $ whois -h <server> hax404.dn42
-
-    # inetnum
-    $ whois -h <server> 172.23.136.0/23
-    # or
-    $ whois -h <server> 172.23.136.1
-
-    # inet6num
-    $ whois -h <server> fd58:eb75:347d::/48
-
-    # route
-    $ whois -h <server> 172.23.136.0/23
-
-    # route6
-    $ whois -h <server> fdec:1:1:dead::/64
-
-    # schema
-    $ whois -h <server> PERSON-SCHEMA
-
-    # organisation
-    $ whois -h <server> ORG-C3D2
-
-    # tinc-keyset
-    $ whois -h <server> SET-1-DN42-TINC
-
-    # tinc-key
-    $ whois -h <server> AS4242422703
-
-    # as-set
-    $ whois -h <server> 4242420000_4242423999
-
-    # as-block
-    $ whois -h <server> AS-FREIFUNK
-
-    # route-set
-    $ whois -h <server> RS-DN42-NATIVE
+- [ ] Support for filtering
+- [ ] Match multiple objects by inverse index
diff --git a/whois42d.service b/whois42d.service
new file mode 100644
index 0000000..65bce75
--- /dev/null
+++ b/whois42d.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Whois dn42 daemon
+
+[Service]
+ExecStart=/usr/local/bin/whois42d -registry /var/lib/whois42d/registry
+User=nobody
diff --git a/whois42d.socket b/whois42d.socket
new file mode 100644
index 0000000..a983866
--- /dev/null
+++ b/whois42d.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=Whois dn42 daemon socket
+
+[Socket]
+ListenStream=43
+
+[Install]
+WantedBy=sockets.target