diff --git a/macrosin.diff b/macrosin.diff
index 5508b3d..87f124a 100644
--- a/macrosin.diff
+++ b/macrosin.diff
@@ -313,7 +313,7 @@
 +%service_del_postun() %{restart_on_update %{1}}
 +
 +%user_group_add() \
-+/usr/sbin/groupadd -o -r %{1} 2>/dev/null || :\
-+/usr/sbin/useradd -o -r -g %{1} -d %{2} -s %{3} -c %{4} %{1} 2>/dev/null || :\
++/usr/sbin/groupadd -r %{1} 2>/dev/null || :\
++/usr/sbin/useradd -r -g %{1} -d %{2} -s %{3} -c %{4} %{1} 2>/dev/null || :\
 +%{nil}
 +
diff --git a/rpm.changes b/rpm.changes
index 32a7859..2ed053d 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Nov 20 18:47:06 UTC 2012 - dimstar@opensuse.org
+
+- Change user_group_add macro to not invoke useradd and groupadd
+  with -o parameter. Non-unique does not make sense when not
+  passing -u/-g (useradd/groupadd) and fails on newer pwdutils/
+  shadowurils implementations. The macro does not allow for a
+  uid/gid being passed. 
+
 -------------------------------------------------------------------
 Mon Nov 12 10:29:13 UTC 2012 - coolo@suse.com