diff --git a/setup-2.7.5.patch b/setup-2.7.5.patch
index 030d6be..6c4c4cc 100644
--- a/setup-2.7.5.patch
+++ b/setup-2.7.5.patch
@@ -36,3 +36,14 @@ diff -urNp setup-2.7.5-orig/profile setup-2.7.5/profile
 -
  unset i
  unset pathmunge
+diff -urNp setup-2.7.5-orig/uidgid setup-2.7.5/uidgid
+--- setup-2.7.5-orig/uidgid	2008-11-27 13:03:16.000000000 +0100
++++ setup-2.7.5/uidgid	2008-12-18 12:41:22.000000000 +0100
+@@ -21,6 +21,7 @@ games		12	(100)	/usr/games		/sbin/nologi
+ gopher		13	30	/usr/lib/gopher-data	/sbin/nologin	setup
+ ftp		14	50	/var/ftp		/sbin/nologin	setup
+ man		-	15	-			-		setup
++pkiuser		17	17	/usr/share/pki	/sbin/nologin	pki-ca,rhpki-ca
+ floppy		-	19	-			-		dev,MAKEDEV
+ games		-	20	-			-		setup
+ slocate		-	21	-			-		slocate
diff --git a/setup.spec b/setup.spec
index 567b6c2..af377da 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,7 +1,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.7.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
@@ -10,6 +10,8 @@ Patch1: setup-2.7.5.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
+Requires(post): grep
+
 Conflicts: initscripts < 4.26, bash <= 2.0.4-21
 
 %description
@@ -50,6 +52,14 @@ rm -f %{buildroot}/etc/setup.spec
 %clean
 rm -rf %{buildroot}
 
+%post
+if [ `grep -c video /etc/group` -eq 0 ] ; then
+  groupadd -g 39 video
+fi
+if [ `grep -c audio /etc/group` -eq 0 ] ; then
+  groupadd -g 63 audio
+fi
+
 %files
 %defattr(-,root,root)
 %doc uidgid
@@ -81,6 +91,11 @@ rm -rf %{buildroot}
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Thu Dec 18 2008 Ondrej Vasik <ovasik@redhat.com> 2.7.5-3
+- add pkiuser (17:17) to uidgid
+- temporarily create video/audio group in post section
+  (#476886)
+
 * Wed Dec 10 2008 Ondrej Vasik <ovasik@redhat.com> 2.7.5-2
 - do not export PATH twice(#449286 NOTABUG revert)
 - do not export INPUTRC(to respect just created ~/.inputrc)