diff --git a/openldap-userconfig-setgid.patch b/openldap-userconfig-setgid.patch
deleted file mode 100644
index 70f0d28..0000000
--- a/openldap-userconfig-setgid.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Normally, skips reading of user configuration file when running with different effective UID.
-This patch adds the same behavior for GID.
-
-Author: Nalin Dahyabhai <nalin@redhat.com>
-
-diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
-index e6b17b4..fbf4829 100644
---- a/libraries/libldap/init.c
-+++ b/libraries/libldap/init.c
-@@ -678,7 +678,7 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
- 	openldap_ldap_init_w_sysconf(LDAP_CONF_FILE);
- 
- #ifdef HAVE_GETEUID
--	if ( geteuid() != getuid() )
-+	if ( geteuid() != getuid() || getegid() != getgid() )
- 		return;
- #endif
- 
diff --git a/openldap.spec b/openldap.spec
index 1d7f708..c90fbb1 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -28,7 +28,6 @@ Patch0: openldap-manpages.patch
 Patch2: openldap-sql-linking.patch
 Patch3: openldap-reentrant-gethostby.patch
 Patch4: openldap-smbk5pwd-overlay.patch
-Patch6: openldap-userconfig-setgid.patch
 Patch8: openldap-syncrepl-unset-tls-options.patch
 Patch9: openldap-man-sasl-nocanon.patch
 Patch10: openldap-ai-addrconfig.patch
@@ -152,7 +151,6 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch6 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -584,6 +582,7 @@ exit 0
 * Fri Jan 16 2015 Jan Synáček <jsynacek@redhat.com> - 2.4.40-6
 - remove openldap-fedora-systemd.patch
 - remove openldap-ldaprc-currentdir.patch
+- remove openldap-userconfig-setgid.patch
 
 * Wed Dec 17 2014 Jan Synáček <jsynacek@redhat.com> - 2.4.40-5
 - harden the build