diff --git a/build/openldap.m4 b/build/openldap.m4
index 3594e54ddb..c69f1246f2 100644
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -274,7 +274,7 @@ AC_DEFUN([OL_RESOLVER_TRY],
 	unsigned char host[64*1024];
 	unsigned char *p;
 
-#ifdef HS_HFIXEDSZ
+#ifdef NS_HFIXEDSZ
 	/* Bind 8/9 interface */
 	len = res_query(request, ns_c_in, ns_t_srv, reply, sizeof(reply));
 #else
@@ -285,7 +285,7 @@ AC_DEFUN([OL_RESOLVER_TRY],
 	len = res_query(request, C_IN, T_SRV, reply, sizeof(reply));
 #endif
 	p = reply;
-#ifdef HS_HFIXEDSZ
+#ifdef NS_HFIXEDSZ
 	/* Bind 8/9 interface */
 	p += NS_HFIXEDSZ;
 #elif defined(HFIXEDSZ)
diff --git a/configure b/configure
index 4ef54c1f63..18a3deab87 100755
--- a/configure
+++ b/configure
@@ -10275,7 +10275,7 @@ int main() {
 	unsigned char host[64*1024];
 	unsigned char *p;
 
-#ifdef HS_HFIXEDSZ
+#ifdef NS_HFIXEDSZ
 	/* Bind 8/9 interface */
 	len = res_query(request, ns_c_in, ns_t_srv, reply, sizeof(reply));
 #else
@@ -10286,7 +10286,7 @@ int main() {
 	len = res_query(request, C_IN, T_SRV, reply, sizeof(reply));
 #endif
 	p = reply;
-#ifdef HS_HFIXEDSZ
+#ifdef NS_HFIXEDSZ
 	/* Bind 8/9 interface */
 	p += NS_HFIXEDSZ;
 #elif defined(HFIXEDSZ)
@@ -10356,7 +10356,7 @@ int main() {
 	unsigned char host[64*1024];
 	unsigned char *p;
 
-#ifdef HS_HFIXEDSZ
+#ifdef NS_HFIXEDSZ
 	/* Bind 8/9 interface */
 	len = res_query(request, ns_c_in, ns_t_srv, reply, sizeof(reply));
 #else
@@ -10367,7 +10367,7 @@ int main() {
 	len = res_query(request, C_IN, T_SRV, reply, sizeof(reply));
 #endif
 	p = reply;
-#ifdef HS_HFIXEDSZ
+#ifdef NS_HFIXEDSZ
 	/* Bind 8/9 interface */
 	p += NS_HFIXEDSZ;
 #elif defined(HFIXEDSZ)
@@ -10437,7 +10437,7 @@ int main() {
 	unsigned char host[64*1024];
 	unsigned char *p;
 
-#ifdef HS_HFIXEDSZ
+#ifdef NS_HFIXEDSZ
 	/* Bind 8/9 interface */
 	len = res_query(request, ns_c_in, ns_t_srv, reply, sizeof(reply));
 #else
@@ -10448,7 +10448,7 @@ int main() {
 	len = res_query(request, C_IN, T_SRV, reply, sizeof(reply));
 #endif
 	p = reply;
-#ifdef HS_HFIXEDSZ
+#ifdef NS_HFIXEDSZ
 	/* Bind 8/9 interface */
 	p += NS_HFIXEDSZ;
 #elif defined(HFIXEDSZ)