diff --git a/openldap-ai-addrconfig.patch b/openldap-ai-addrconfig.patch
new file mode 100644
index 0000000..9b3c959
--- /dev/null
+++ b/openldap-ai-addrconfig.patch
@@ -0,0 +1,27 @@
+use AI_ADDRCONFIG if defined in the environment
+
+Author: Jan Vcelak <jvcelak@redhat.com>
+Upstream ITS: #7326
+Resolves: #835013
+
+---
+ libraries/libldap/os-ip.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
+index 2864256..c3e0876 100644
+--- a/libraries/libldap/os-ip.c
++++ b/libraries/libldap/os-ip.c
+@@ -584,8 +584,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
+ 
+ #if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
+ 	memset( &hints, '\0', sizeof(hints) );
+-#ifdef USE_AI_ADDRCONFIG /* FIXME: configure test needed */
+-	/* Use AI_ADDRCONFIG only on systems where its known to be needed. */
++#ifdef AI_ADDRCONFIG
+ 	hints.ai_flags = AI_ADDRCONFIG;
+ #endif
+ 	hints.ai_family = ldap_int_inet4or6;
+-- 
+1.7.10.4
+
diff --git a/openldap.spec b/openldap.spec
index 28f5df0..7bf1645 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -8,7 +8,7 @@
 
 Name: openldap
 Version: 2.4.31
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -46,6 +46,7 @@ Patch14: openldap-nss-clean-memory-for-token-pin.patch
 Patch15: openldap-cve-nss-cipher-suite-ignored.patch
 Patch16: openldap-nss-default-cipher-suite-always-selected.patch
 Patch17: openldap-nss-multiple-tls-contexts.patch
+Patch18: openldap-ai-addrconfig.patch
 
 # Fedora specific patches
 Patch100: openldap-autoconf-pkgconfig-nss.patch
@@ -165,6 +166,7 @@ ln -s %{_includedir}/nspr4 include/nspr
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %patch101 -p1
 
@@ -622,6 +624,9 @@ exit 0
 %{evolution_connector_prefix}/
 
 %changelog
+* Thu Jul 19 2012 Jan Vcelak <jvcelak@redhat.com> 2.4.31-5
+- fix: querying for IPv6 DNS records when IPv6 is disabled on the host (#835013)
+
 * Wed Jul 18 2012 Jan Vcelak <jvcelak@redhat.com> 2.4.31-4
 - modify the package build process
   + fix autoconfig files to detect Mozilla NSS library using pkg-config