diff --git a/etc/systemd/system/README.md b/etc/systemd/system/README.md
index ead36349..a3a937bf 100644
--- a/etc/systemd/system/README.md
+++ b/etc/systemd/system/README.md
@@ -1,6 +1,6 @@
 Systemd services. These are sorted by some kind of category into
 subdirectories. The sudirectories won't exist in the real
-`/etc/systemd/system` unless they end `.wants` or something similar
+`/etc/systemd/system` unless they end `.wants` or `.d` or something similar
 and I forget to update this README file if that happens.
 
 * reflector.service is copied from https://wiki.archlinux.org/index.php/Reflector
diff --git a/etc/systemd/system/ipv6/miredo.service b/etc/systemd/system/ipv6/miredo.service
deleted file mode 100644
index 37928d3c..00000000
--- a/etc/systemd/system/ipv6/miredo.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Teredo IPv6 Tunneling Daemon
-After=network-online.target unbound.service
-
-[Service]
-ExecStart=/usr/bin/miredo -f
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/etc/systemd/system/miredo.service.d/override.conf b/etc/systemd/system/miredo.service.d/override.conf
new file mode 100644
index 00000000..0bb22306
--- /dev/null
+++ b/etc/systemd/system/miredo.service.d/override.conf
@@ -0,0 +1,3 @@
+[Unit]
+# If unbound is used for DNS, also add unbound.service
+After=network-online.target
diff --git a/etc/systemd/system/oidentd.socket b/etc/systemd/system/oidentd.socket
deleted file mode 100644
index ffe376b6..00000000
--- a/etc/systemd/system/oidentd.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Ident (RFC 1413) socket
-
-[Socket]
-ListenStream=113
-BindIPv6Only=both
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/etc/systemd/system/oidentd.socket.d/override.conf b/etc/systemd/system/oidentd.socket.d/override.conf
new file mode 100644
index 00000000..3c69f4b4
--- /dev/null
+++ b/etc/systemd/system/oidentd.socket.d/override.conf
@@ -0,0 +1,2 @@
+[Socket]
+BindIPv6Only=both