diff --git a/.gitignore b/.gitignore
index d5c14f297646180b61e8e01ac9b20448228bdbe7..7579e289674a903ab64b6ef5c118cbf4f8c63377 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,6 @@
 .libs
 .deps
 _obj
-tmp*
 /autom4te.cache/*
 /config.log
 /config.h
diff --git a/systemd/knot-resolver-control.socket b/systemd/knot-resolver-control.socket
new file mode 100644
index 0000000000000000000000000000000000000000..9f1976e8e77c2b3d59b9703e96af7d7454ad3e65
--- /dev/null
+++ b/systemd/knot-resolver-control.socket
@@ -0,0 +1,13 @@
+[Unit]
+Description=Knot DNS Resolver control socket
+Documentation=man:kresd(8)
+Before=sockets.target
+
+[Socket]
+ListenStream=/run/knot-resolver/control
+FileDescriptorName=control
+Service=knot-resolver.service
+SocketMode=0660
+
+[Install]
+WantedBy=sockets.target
diff --git a/systemd/knot-resolver.service b/systemd/knot-resolver.service
new file mode 100644
index 0000000000000000000000000000000000000000..927b06a6ea1991370c1c623d43e2ac96377b9866
--- /dev/null
+++ b/systemd/knot-resolver.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Knot DNS Resolver daemon
+## This is a socket-activated service:
+RefuseManualStart=true
+
+[Service]
+Type=notify
+WorkingDirectory=/run/knot-resolver/cache
+ExecStart=/usr/sbin/kresd
+User=knot-resolver
+Restart=on-failure
+
+[Install]
+WantedBy=sockets.target
diff --git a/systemd/knot-resolver.socket b/systemd/knot-resolver.socket
new file mode 100644
index 0000000000000000000000000000000000000000..7d8953c233416474d5a082d78f9541a53cdefa4b
--- /dev/null
+++ b/systemd/knot-resolver.socket
@@ -0,0 +1,13 @@
+[Unit]
+Description=Knot DNS Resolver network listeners
+Documentation=man:kresd(8)
+Before=sockets.target
+
+[Socket]
+ListenStream=[::1]:53
+ListenDatagram=[::1]:53
+ListenStream=127.0.0.1:53
+ListenDatagram=127.0.0.1:53
+
+[Install]
+WantedBy=sockets.target
diff --git a/systemd/tmpfiles/knot-resolver.conf b/systemd/tmpfiles/knot-resolver.conf
new file mode 100644
index 0000000000000000000000000000000000000000..6006f030e17fdb465904c997a549203485794c11
--- /dev/null
+++ b/systemd/tmpfiles/knot-resolver.conf
@@ -0,0 +1,7 @@
+# tmpfiles.d(5) runtime directory for knot-resolver (kresd)
+#Type Path                            Mode UID           GID          Age Argument
+    d /run/knot-resolver              0750 root          root          -   -
+    d /run/knot-resolver/cache        0750 knot-resolver knot-resolver -   -
+    L /run/knot-resolver/cache/config 0750 knot-resolver knot-resolver -   /etc/knot-resolver/kresd.conf
+
+