diff --git a/setup-2.7.7-uidgid.patch b/setup-2.7.7-uidgid.patch
new file mode 100644
index 0000000..9289027
--- /dev/null
+++ b/setup-2.7.7-uidgid.patch
@@ -0,0 +1,21 @@
+diff -urNp setup-2.7.7-orig/uidgid setup-2.7.7/uidgid
+--- setup-2.7.7-orig/uidgid	2009-01-22 14:00:18.000000000 +0100
++++ setup-2.7.7/uidgid	2009-01-29 12:40:37.000000000 +0100
+@@ -23,6 +23,7 @@ gopher	13	30	/usr/lib/gopher-data		/sbin
+ ftp	14	50	/var/ftp		/sbin/nologin	setup
+ man	-	15	-		-	setup
+ pkiuser	17	17	/usr/share/pki		/sbin/nologin	pki-ca,rhpki-ca
++dialout	-	18	-		-	udev,MAKEDEV
+ floppy	-	19	-		-	dev,MAKEDEV
+ games	-	20	-		-	setup
+ slocate	-	21	-		-	slocate
+@@ -92,8 +93,7 @@ clamav	83	83	/tmp		/sbin/nologin	clamav
+ screen	-	84	-		-	screen
+ quaggavt	-	85	-		-	quagga
+ sabayon	86	86	-		/sbin/nologin	sabayon
+-polkituser	87	-	/		/sbin/nologin	PolicyKit
+-dialout	-	87	-		-	udev,MAKEDEV
++polkituser	87	87	/		/sbin/nologin	PolicyKit
+ wbpriv	-	88	-		-	samba-common
+ postfix	89	89	/var/spool/postfix		/bin/true	postfix
+ postdrop	-	90	-		-	postfix
diff --git a/setup.spec b/setup.spec
index e40294a..2883822 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,11 +1,12 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.7.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
 Source: setup-%{version}.tar.bz2
+Patch1: setup-2.7.7-uidgid.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
@@ -18,6 +19,7 @@ setup files, such as passwd, group, and profile.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 
@@ -87,6 +89,11 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Thu Jan 29 2009 Ondrej Vasik <ovasik@redhat.com> 2.7.7-2
+- reserve 87 gid for polkituser (just uid was reserved),
+  reserve 18 gid for dialout(to prevent conflicts with
+  polkituser gid)
+
 * Thu Jan 22 2009 Ondrej Vasik <ovasik@redhat.com> 2.7.7-1
 - synchronize /etc/services with latest IANA, do not use
   tabs in that file to have consistent output