diff --git a/lib/bind/configure b/lib/bind/configure
index 4eac01ef2d..433626227d 100644
--- a/lib/bind/configure
+++ b/lib/bind/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 
-# From configure.in Revision: 1.44 
+# From configure.in Revision: 1.45 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -3604,16 +3604,16 @@ EOF
 if { (eval echo configure:3605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
-			 result="#define LWRES_HAVE_SIN6_SCOPE_ID 1"
+			 result="#define HAVE_SIN6_SCOPE_ID 1"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
-			 result="#undef LWRES_HAVE_SIN6_SCOPE_ID"
+			 result="#undef HAVE_SIN6_SCOPE_ID"
 fi
 rm -f conftest*
-		LWRES_HAVE_SIN6_SCOPE_ID="$result"
+		HAVE_SIN6_SCOPE_ID="$result"
 
 		echo $ac_n "checking for in6_pktinfo""... $ac_c" 1>&6
 echo "configure:3620: checking for in6_pktinfo" >&5
@@ -3648,7 +3648,7 @@ rm -f conftest*
 		HAS_INET6_STRUCTS="#undef HAS_INET6_STRUCTS"
 		NEED_IN6ADDR_ANY="#undef NEED_IN6ADDR_ANY"
 		ISC_PLATFORM_HAVEIN6PKTINFO="#undef ISC_PLATFORM_HAVEIN6PKTINFO"
-		LWRES_HAVE_SIN6_SCOPE_ID="#define LWRES_HAVE_SIN6_SCOPE_ID 1"
+		HAVE_SIN6_SCOPE_ID="#define HAVE_SIN6_SCOPE_ID 1"
 		ISC_IPV6_H="ipv6.h"
 		ISC_IPV6_O="ipv6.$O"
 		ISC_ISCIPV6_O="unix/ipv6.$O"
@@ -5737,7 +5737,7 @@ rm -f conftest*
 
 else
   echo "$ac_t""no" 1>&6
-HOST_R_SET_RESULT="#undef HOST_R_SET_RESULT /*empty*/"
+host_R_SET_RESULT="#undef HOST_R_SET_RESULT /*empty*/"
 HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void"
 
 fi
@@ -7478,7 +7478,7 @@ s%@ISC_IPV6_H@%$ISC_IPV6_H%g
 s%@ISC_IPV6_O@%$ISC_IPV6_O%g
 s%@ISC_ISCIPV6_O@%$ISC_ISCIPV6_O%g
 s%@ISC_IPV6_C@%$ISC_IPV6_C%g
-s%@LWRES_HAVE_SIN6_SCOPE_ID@%$LWRES_HAVE_SIN6_SCOPE_ID%g
+s%@HAVE_SIN6_SCOPE_ID@%$HAVE_SIN6_SCOPE_ID%g
 s%@ISC_PLATFORM_NEEDNTOP@%$ISC_PLATFORM_NEEDNTOP%g
 s%@ISC_PLATFORM_NEEDPTON@%$ISC_PLATFORM_NEEDPTON%g
 s%@ISC_PLATFORM_NEEDATON@%$ISC_PLATFORM_NEEDATON%g
@@ -7622,7 +7622,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=50 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index 6c564c1d50..59bd0f0a79 100644
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.45 $)
+AC_REVISION($Revision: 1.46 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -924,10 +924,10 @@ $isc_netinet6in6_hack
 ],
 		[struct sockaddr_in6 xyzzy; xyzzy.sin6_scope_id = 0; return (0);],
 			[AC_MSG_RESULT(yes)
-			 result="#define LWRES_HAVE_SIN6_SCOPE_ID 1"],
+			 result="#define HAVE_SIN6_SCOPE_ID 1"],
 			[AC_MSG_RESULT(no)
-			 result="#undef LWRES_HAVE_SIN6_SCOPE_ID"])
-		LWRES_HAVE_SIN6_SCOPE_ID="$result"
+			 result="#undef HAVE_SIN6_SCOPE_ID"])
+		HAVE_SIN6_SCOPE_ID="$result"
 
 		AC_MSG_CHECKING(for in6_pktinfo)
 		AC_TRY_COMPILE([
@@ -947,7 +947,7 @@ $isc_netinet6in6_hack
 		HAS_INET6_STRUCTS="#undef HAS_INET6_STRUCTS"
 		NEED_IN6ADDR_ANY="#undef NEED_IN6ADDR_ANY"
 		ISC_PLATFORM_HAVEIN6PKTINFO="#undef ISC_PLATFORM_HAVEIN6PKTINFO"
-		LWRES_HAVE_SIN6_SCOPE_ID="#define LWRES_HAVE_SIN6_SCOPE_ID 1"
+		HAVE_SIN6_SCOPE_ID="#define HAVE_SIN6_SCOPE_ID 1"
 		ISC_IPV6_H="ipv6.h"
 		ISC_IPV6_O="ipv6.$O"
 		ISC_ISCIPV6_O="unix/ipv6.$O"
@@ -968,7 +968,7 @@ AC_SUBST(ISC_IPV6_H)
 AC_SUBST(ISC_IPV6_O)
 AC_SUBST(ISC_ISCIPV6_O)
 AC_SUBST(ISC_IPV6_C)
-AC_SUBST(LWRES_HAVE_SIN6_SCOPE_ID)
+AC_SUBST(HAVE_SIN6_SCOPE_ID)
 
 #
 # Check for network functions that are often missing.  We do this
@@ -1534,7 +1534,7 @@ extern void sethostent_r(int flag, struct hostent_data *ht_data);],[],
 HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void"],
 )
 ,
-HOST_R_SET_RESULT="#undef HOST_R_SET_RESULT /*empty*/"
+host_R_SET_RESULT="#undef HOST_R_SET_RESULT /*empty*/"
 HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void"
 )
 AC_SUBST(HOST_R_SET_RESULT)
diff --git a/lib/bind/irs/gethostent_r.c b/lib/bind/irs/gethostent_r.c
index fd174b409a..2470629690 100644
--- a/lib/bind/irs/gethostent_r.c
+++ b/lib/bind/irs/gethostent_r.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: gethostent_r.c,v 1.1 2001/03/29 06:31:45 marka Exp $";
+static const char rcsid[] = "$Id: gethostent_r.c,v 1.2 2001/05/10 07:29:54 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <port_before.h>
@@ -97,7 +97,7 @@ HOST_R_END_RETURN
 #ifdef HOST_R_ENT_ARGS
 endhostent_r(HOST_R_ENT_ARGS)
 #else
-endhostent_r()
+endhostent_r(void)
 #endif
 {
 	endhostent();
diff --git a/lib/bind/port_after.h.in b/lib/bind/port_after.h.in
index a93d4622ec..57a43cb48e 100644
--- a/lib/bind/port_after.h.in
+++ b/lib/bind/port_after.h.in
@@ -16,6 +16,7 @@
 @NEED_STRSEP@
 @NEED_STRERROR@
 @HAS_INET6_STRUCTS@
+@HAVE_SIN6_SCOPE_ID@
 @NEED_IN6ADDR_ANY@
 @HAS_IN_ADDR6@