diff --git a/libtailscale/backend.go b/libtailscale/backend.go
index 16fa0c6701..82ca78ece3 100644
--- a/libtailscale/backend.go
+++ b/libtailscale/backend.go
@@ -115,11 +115,14 @@ func (a *App) runBackend(ctx context.Context, hardwareAttestation bool) error {
 	paths.AppSharedDir.Store(a.dataDir)
 	hostinfo.SetOSVersion(a.osVersion())
 	hostinfo.SetPackage(a.appCtx.GetInstallSource())
-	deviceModel := a.modelName()
+	deviceModel := a.deviceName()
 	if a.isChromeOS() {
 		deviceModel = "ChromeOS: " + deviceModel
 	}
 	hostinfo.SetDeviceModel(deviceModel)
+	hostinfo.SetHostnameFn(func() (string, error) {
+		return a.deviceName(), nil
+	})
 
 	type configPair struct {
 		rcfg *router.Config
diff --git a/libtailscale/tailscale.go b/libtailscale/tailscale.go
index f3c6938a8f..0c22a6e7a3 100644
--- a/libtailscale/tailscale.go
+++ b/libtailscale/tailscale.go
@@ -88,9 +88,9 @@ func (a *App) osVersion() string {
 	return version
 }
 
-// modelName return the MANUFACTURER + MODEL from
+// deviceName returns the user-set name if available, or MANUFACTURER + MODEL from
 // android.os.Build.
-func (a *App) modelName() string {
+func (a *App) deviceName() string {
 	model, err := a.appCtx.GetDeviceName()
 	if err != nil {
 		panic(err)