diff --git a/samba/CHANGELOG.md b/samba/CHANGELOG.md
index 4526ed32b16..3043fc6c4bc 100644
--- a/samba/CHANGELOG.md
+++ b/samba/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Changelog
+## 12.4.1
+
+- Add the option to enable SAMBA to become local browsermaster
+- Add the option to enable SAMBA WINS Server
+
 ## 12.4.0
 
 - Add the ability to enable and disable specific shares, improving user control over folder access
diff --git a/samba/DOCS.md b/samba/DOCS.md
index 49729074c8b..68f4ed47fbc 100644
--- a/samba/DOCS.md
+++ b/samba/DOCS.md
@@ -58,6 +58,8 @@ veto_files:
   - ".DS_Store"
   - Thumbs.db
 compatibility_mode: false
+winsserver_mode: false
+masterbrowser_mode: true
 ```
 
 ### Option: `workgroup` (required)
diff --git a/samba/config.yaml b/samba/config.yaml
index 99a27a02526..a3d2031fbfd 100644
--- a/samba/config.yaml
+++ b/samba/config.yaml
@@ -36,6 +36,8 @@ options:
     - share
     - ssl
   compatibility_mode: false
+  winsserver_mode: false
+  masterbrowser_mode: true
   veto_files:
     - ._*
     - .DS_Store
@@ -56,6 +58,8 @@ schema:
   enabled_shares:
     - "match(^(?i:(addons|addon_configs|backup|config|media|share|ssl))$)"
   compatibility_mode: bool
+  winsserver_mode: bool
+  masterbrowser_mode: bool
   veto_files:
     - str
   allow_hosts:
diff --git a/samba/rootfs/usr/share/tempio/smb.gtpl b/samba/rootfs/usr/share/tempio/smb.gtpl
index ad35a3e6fdf..4f01aaffe6b 100644
--- a/samba/rootfs/usr/share/tempio/smb.gtpl
+++ b/samba/rootfs/usr/share/tempio/smb.gtpl
@@ -3,6 +3,17 @@
    workgroup = {{ .workgroup }}
    server string = Samba Home Assistant
 
+   {{ if .winsserver_mode }}
+   wins support = yes
+   {{ end }}
+
+   {{ if .masterbrowser_mode }}
+   domain master = yes
+   preferred master = yes
+   local master = yes
+   os level = 255
+   {{ end }}
+
    security = user
    ntlm auth = yes
    idmap config * : backend = tdb
diff --git a/samba/translations/en.yaml b/samba/translations/en.yaml
index 4b4e855af16..99985ada2cf 100644
--- a/samba/translations/en.yaml
+++ b/samba/translations/en.yaml
@@ -24,6 +24,14 @@ configuration:
     name: Enable Compatibility Mode
     description: >-
       Enable this to use old legacy Samba protocols on the Samba add-on.
+  masterbrowser_mode:
+    name: Enable Master Browser mode
+    description: >-
+      Enable Master Browser mode for the workgroup on this Samba add-on.
+  winsserver_mode:
+    name: Enable WINS Server
+    description: >-
+      Enable this to use old legacy WINS protocols on this Samba add-on.
   veto_files:
     name: Veto Files
     description: List of files that are neither visible nor accessible.