diff --git a/setup-2.8.2-uidgid.patch b/setup-2.8.2-uidgid.patch
new file mode 100644
index 0000000..88b08fd
--- /dev/null
+++ b/setup-2.8.2-uidgid.patch
@@ -0,0 +1,11 @@
+diff -urNp setup-2.8.2-orig/uidgid setup-2.8.2/uidgid
+--- setup-2.8.2-orig/uidgid	2009-03-24 12:02:57.000000000 +0100
++++ setup-2.8.2/uidgid	2009-03-25 14:32:50.000000000 +0100
+@@ -70,6 +70,7 @@ prelude-manager	61	61	-		/sbin/nologin	p
+ snortd	62	62	-		/sbin/nologin	snortd
+ audio	-	63	-		-	setup
+ condor	64	64	/var/lib/condor		/sbin/nologin	condord
++nslcd	65	(55)	/		/sbin/nologin	nslcd
+ wine	-	66	-		-	wine
+ pegasus	66	65	/var/lib/Pegasus		/sbin/nologin	tog-pegasus
+ webalizer	67	67	/var/www/html/usage		/sbin/nologin	webalizer
diff --git a/setup.spec b/setup.spec
index b77ba8b..c99f526 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,11 +1,12 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://fedorahosted.org/setup/
 Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2
+Patch1: setup-2.8.2-uidgid.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: bash tcsh perl
@@ -17,6 +18,7 @@ setup files, such as passwd, group, and profile.
 
 %prep
 %setup -q
+%patch1 -p1
 ./shadowconvert.sh
 
 %build
@@ -90,6 +92,9 @@ rm -f /etc/gshadow.rpmnew
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Wed Mar 25 2009 Ondrej Vasik <ovasik@redhat.com> 2.8.2-2
+- reserve uid 65 for nslcd (will share group 55 ldap, #491899)
+
 * Tue Mar 24 2009 Ondrej Vasik <ovasik@redhat.com> 2.8.2-1
 - ship COPYING file, update protocols and services
   to latest IANA