diff --git a/fetchmail.changes b/fetchmail.changes
index 0a87d88..ca35430 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jan 12 10:39:18 UTC 2022 - David Anes <david.anes@suse.com>
+
+- fix [bsc#1194203]:
+  * Always create fetchmail group, even if the user is already 
+  present, as a leftover from Leap 15.2 upgrade. This may happen 
+  also if user is messing with groups/users directly or upgrading 
+  from even an older fetchmail versions. 
+
 -------------------------------------------------------------------
 Mon Dec 27 16:50:06 UTC 2021 - David Anes <david.anes@suse.com>
 
diff --git a/fetchmail.spec b/fetchmail.spec
index 98a883f..ac5283c 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fetchmail
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/fetchmail.sysusers b/fetchmail.sysusers
index c3cefac..d495863 100644
--- a/fetchmail.sysusers
+++ b/fetchmail.sysusers
@@ -1,3 +1,11 @@
 # Type Name ID GECOS [HOME]
-u fetchmail - "mail retrieval daemon" /var/lib/fetchmail
+
+# during upgrade from previous versions, the group may
+# have been deleted but the user still be present. Therefore
+# we have to be sure to recreate the group, as adding only
+# the user (if already present) won't create it
+g fetchmail -
+
+u fetchmail - "mail retrieval daemon" /var/lib/fetchmail
+m fetchmail fetchmail