@@ -136,7 +136,9 @@ Settings are stored in `~/.config/sendspin/`:
   "listen_port": 8927,
   "use_mpris": true,
   "use_hardware_volume": true,
-  "hook_set_volume": "/usr/local/bin/set-avr-volume"
+  "hook_set_volume": "/usr/local/bin/set-avr-volume",
+  "manufacturer": "Acme Corp",
+  "product_name": "Living Room Speaker"
 }
 ```
 
@@ -170,6 +172,8 @@ Settings are stored in `~/.config/sendspin/`:
 | `hook_set_volume` | string | TUI/daemon | Script to run for external volume control (`--hook-set-volume`). Receives the effective volume 0-100 as the last argument |
 | `hook_start` | string | TUI/daemon | Command to run when audio stream starts |
 | `hook_stop` | string | TUI/daemon | Command to run when audio stream stops |
+| `manufacturer` | string | TUI/daemon | Manufacturer name reported in the client hello (`--manufacturer`) |
+| `product_name` | string | TUI/daemon | Product name reported in the client hello (`--product-name`); defaults to auto-detected OS/platform name |
 | `source` | string | serve | Default audio source (file path or URL, ffmpeg input) |
 | `source_format` | string | serve | ffmpeg container format for audio source |
 | `clients` | array | serve | Client URLs to connect to (`--client`) |
@@ -304,6 +308,12 @@ sendspin daemon --name "Kitchen" --audio-device 2
 
 In daemon mode without `--url`, the client listens for incoming server connections and advertises itself via mDNS. The `--name` option (or `name` setting) is used as the friendly name in the mDNS advertisement, making it easy for servers to identify this client on the network.
 
+Use `--manufacturer` and `--product-name` to override the device identity reported to the server in the client hello. This is useful when running the daemon in a container or on a custom device where the auto-detected OS name is not meaningful:
+
+```bash
+sendspin daemon --name "Living Room" --manufacturer "Acme" --product-name "Living Room Speaker"
+```
+
 ### Hooks
 
 You can run external commands when audio streams start or stop. This is useful for controlling amplifiers, lighting, or other home automation:
 
@@ -168,6 +168,18 @@ def _add_player_runtime_options(target: ArgumentTarget, *, suppress_defaults: bo
         metavar="{true,false}",
         help="Enable or disable hardware/system volume control (daemon: on, TUI: off)",
     )
+    target.add_argument(
+        "--manufacturer",
+        type=str,
+        default=default,
+        help="Manufacturer name reported in the client hello (e.g., 'Acme Corp')",
+    )
+    target.add_argument(
+        "--product-name",
+        type=str,
+        default=default,
+        help="Product name reported in the client hello (defaults to auto-detected OS/platform name)",
+    )
     target.add_argument(
         "--hook-start",
         type=str,
@@ -393,6 +405,18 @@ def _build_parser() -> argparse.ArgumentParser:
         default=None,
         help="Command to run when audio stream stops (receives SENDSPIN_* env vars)",
     )
+    daemon_parser.add_argument(
+        "--manufacturer",
+        type=str,
+        default=None,
+        help="Manufacturer name reported in the client hello (e.g., 'Acme Corp')",
+    )
+    daemon_parser.add_argument(
+        "--product-name",
+        type=str,
+        default=None,
+        help="Product name reported in the client hello (defaults to auto-detected OS/platform name)",
+    )
 
     return parser
 
@@ -566,6 +590,8 @@ async def _run_daemon_mode(
         volume_controller=volume_controller,
         hook_start=args.hook_start,
         hook_stop=args.hook_stop,
+        manufacturer=args.manufacturer,
+        product_name=args.product_name,
     )
 
     daemon = SendspinDaemon(daemon_args)
@@ -670,6 +696,10 @@ async def _run_client_mode(args: argparse.Namespace) -> int:
         args.hook_start = settings.hook_start
     if args.hook_stop is None:
         args.hook_stop = settings.hook_stop
+    if args.manufacturer is None:
+        args.manufacturer = settings.manufacturer
+    if args.product_name is None:
+        args.product_name = settings.product_name
 
     # Set up logging: daemon uses stderr, TUI writes to sendspin.log
     # so log output doesn't interfere with the Rich display.
@@ -733,6 +763,8 @@ async def _run_client_mode(args: argparse.Namespace) -> int:
         volume_controller=volume_controller,
         hook_start=args.hook_start,
         hook_stop=args.hook_stop,
+        manufacturer=args.manufacturer,
+        product_name=args.product_name,
     )
 
     app = SendspinApp(app_args)
 
@@ -52,6 +52,8 @@ class DaemonArgs:
     volume_controller: VolumeController | None = None
     hook_start: str | None = None
     hook_stop: str | None = None
+    manufacturer: str | None = None
+    product_name: str | None = None
 
 
 class SendspinDaemon:
@@ -90,7 +92,10 @@ def _create_client(self, static_delay_ms: float = 0.0) -> SendspinClient:
             client_id=self._args.client_id,
             client_name=self._args.client_name,
             roles=client_roles,
-            device_info=get_device_info(),
+            device_info=get_device_info(
+                manufacturer=self._args.manufacturer,
+                product_name=self._args.product_name,
+            ),
             player_support=ClientHelloPlayerSupport(
                 supported_formats=supported_formats,
                 buffer_capacity=32_000_000,
 
@@ -119,6 +119,8 @@ class ClientSettings(BaseSettings):
     hook_start: str | None = None
     hook_stop: str | None = None
     visualizer: bool = False
+    manufacturer: str | None = None
+    product_name: str | None = None
 
     def update(
         self,
@@ -202,6 +204,8 @@ def _load(self) -> None:
             self.hook_start = data.get("hook_start")
             self.hook_stop = data.get("hook_stop")
             self.visualizer = data.get("visualizer", False)
+            self.manufacturer = data.get("manufacturer")
+            self.product_name = data.get("product_name")
             logger.info(
                 "Loaded settings from %s: volume=%d%%, muted=%s",
                 self._settings_file,
 
@@ -228,6 +228,8 @@ class AppArgs:
     volume_controller: VolumeController | None = None
     hook_start: str | None = None
     hook_stop: str | None = None
+    manufacturer: str | None = None
+    product_name: str | None = None
 
 
 class SendspinApp:
@@ -292,7 +294,10 @@ def _create_client(self) -> SendspinClient:
             client_id=args.client_id,
             client_name=args.client_name,
             roles=roles,
-            device_info=get_device_info(),
+            device_info=get_device_info(
+                manufacturer=args.manufacturer,
+                product_name=args.product_name,
+            ),
             player_support=ClientHelloPlayerSupport(
                 supported_formats=self._supported_formats,
                 buffer_capacity=32_000_000,
 
@@ -65,38 +65,50 @@ def create_task(
     return task
 
 
-def get_device_info() -> DeviceInfo:
-    """Get device information for the client hello message."""
-    # Get OS/platform information
-    system = platform.system()
-    product_name = f"{system}"
-
-    # Try to get more specific product info
-    if system == "Linux":
-        # Try reading /etc/os-release for distribution info
-        try:
-            os_release = Path("/etc/os-release")
-            if os_release.exists():
-                with os_release.open() as f:
-                    for line in f:
-                        if line.startswith("PRETTY_NAME="):
-                            product_name = line.split("=", 1)[1].strip().strip('"')
-                            break
-        except (OSError, IndexError):
-            pass
-    elif system == "Darwin":
-        mac_version = platform.mac_ver()[0]
-        product_name = f"macOS {mac_version}" if mac_version else "macOS"
-    elif system == "Windows":
-        try:
-            win_ver = platform.win32_ver()
-            # Check build number to distinguish Windows 11 (build 22000+) from Windows 10
-            if win_ver[0] == "10" and win_ver[1] and int(win_ver[1].split(".")[2]) >= 22000:
-                product_name = "Windows 11"
-            else:
-                product_name = f"Windows {win_ver[0]}"
-        except (ValueError, IndexError, AttributeError):
-            product_name = f"Windows {platform.release()}"
+def get_device_info(
+    *,
+    manufacturer: str | None = None,
+    product_name: str | None = None,
+) -> DeviceInfo:
+    """Get device information for the client hello message.
+
+    Args:
+        manufacturer: Override the manufacturer field (default: None).
+        product_name: Override the auto-detected product name.
+    """
+    # Skip OS detection entirely when product_name is explicitly provided.
+    if product_name is not None:
+        detected_product_name = product_name
+    else:
+        system = platform.system()
+        detected_product_name = f"{system}"
+
+        # Try to get more specific product info
+        if system == "Linux":
+            # Try reading /etc/os-release for distribution info
+            try:
+                os_release = Path("/etc/os-release")
+                if os_release.exists():
+                    with os_release.open() as f:
+                        for line in f:
+                            if line.startswith("PRETTY_NAME="):
+                                detected_product_name = line.split("=", 1)[1].strip().strip('"')
+                                break
+            except (OSError, IndexError):
+                pass
+        elif system == "Darwin":
+            mac_version = platform.mac_ver()[0]
+            detected_product_name = f"macOS {mac_version}" if mac_version else "macOS"
+        elif system == "Windows":
+            try:
+                win_ver = platform.win32_ver()
+                # Check build number to distinguish Windows 11 (build 22000+) from Windows 10
+                if win_ver[0] == "10" and win_ver[1] and int(win_ver[1].split(".")[2]) >= 22000:
+                    detected_product_name = "Windows 11"
+                else:
+                    detected_product_name = f"Windows {win_ver[0]}"
+            except (ValueError, IndexError, AttributeError):
+                detected_product_name = f"Windows {platform.release()}"
 
     # Get software version
     try:
@@ -105,7 +117,7 @@ def get_device_info() -> DeviceInfo:
         software_version = "aiosendspin (unknown version)"
 
     return DeviceInfo(
-        product_name=product_name,
-        manufacturer=None,  # Could add manufacturer detection if needed
+        product_name=detected_product_name,
+        manufacturer=manufacturer,
         software_version=software_version,
     )