diff --git a/samba-server.sysusers b/samba-server.sysusers
index c39ef18..88705e6 100644
--- a/samba-server.sysusers
+++ b/samba-server.sysusers
@@ -1,2 +1,3 @@
 g sambashares -
-u guest 65401:65413 "Samba guest user" /dev/null /bin/false
+g guest 65413
+u guest 65401:guest "Samba guest user" /dev/null /bin/false
diff --git a/samba.spec b/samba.spec
index d529891..849203a 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,6 +1,6 @@
 Name:          samba
 Version:       4.21.0
-Release:       2mamba
+Release:       3mamba
 Summary:       Samba provides seamless file and print services to SMB/CIFS clients
 Group:         System/Servers
 Vendor:        openmamba
@@ -614,6 +614,9 @@ fi
 %{_mandir}/man8/winbindd.*
 
 %changelog
+* Sat Sep 21 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 4.21.0-3mamba
+- samba-server.sysusers: create guest group to fix user creation
+
 * Mon Sep 16 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 4.21.0-2mamba
 - don't require python-ldb from obsolete ldb package