diff --git a/cmd/tailscaled/tailscale-online.target b/cmd/tailscaled/tailscale-online.target
new file mode 100644
index 000000000..a8ee7db47
--- /dev/null
+++ b/cmd/tailscaled/tailscale-online.target
@@ -0,0 +1,4 @@
+[Unit]
+Description=Tailscale is online
+Requires=tailscale-wait-online.service
+After=tailscale-wait-online.service
diff --git a/cmd/tailscaled/tailscale-wait-online.service b/cmd/tailscaled/tailscale-wait-online.service
new file mode 100644
index 000000000..eb46a18bf
--- /dev/null
+++ b/cmd/tailscaled/tailscale-wait-online.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Wait for Tailscale to be online
+After=tailscaled.service
+Requires=tailscaled.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/tailscale wait
+RemainAfterExit=yes
+
+[Install]
+WantedBy=tailscale-online.target