diff --git a/ipn/ipnlocal/c2n.go b/ipn/ipnlocal/c2n.go
index 876c13064..4b91c3cb9 100644
--- a/ipn/ipnlocal/c2n.go
+++ b/ipn/ipnlocal/c2n.go
@@ -443,7 +443,7 @@ func findCmdTailscale() (string, error) {
 		}
 	case "windows":
 		ts = filepath.Join(filepath.Dir(self), "tailscale.exe")
-	case "freebsd":
+	case "freebsd", "openbsd":
 		if self == "/usr/local/bin/tailscaled" {
 			ts = "/usr/local/bin/tailscale"
 		}
diff --git a/ipn/ipnserver/actor.go b/ipn/ipnserver/actor.go
index dd40924bb..9d86d2c82 100644
--- a/ipn/ipnserver/actor.go
+++ b/ipn/ipnserver/actor.go
@@ -144,7 +144,7 @@ func (a *actor) Username() (string, error) {
 		}
 		defer tok.Close()
 		return tok.Username()
-	case "darwin", "linux", "illumos", "solaris":
+	case "darwin", "linux", "illumos", "solaris", "openbsd":
 		uid, ok := a.ci.Creds().UserID()
 		if !ok {
 			return "", errors.New("missing user ID")