diff --git a/Misc/NEWS b/Misc/NEWS
index f2aa3387022..2fb60230c21 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -445,6 +445,9 @@ Tools/Demos
 Build
 -----
 
+- Bug #934635: Fixed a bug where the configure script couldn't detect
+  getaddrinfo() properly if the KAME stack had SCTP support.
+
 - Support for missing ANSI C header files (limits.h, stddef.h, etc) was
   removed.
 
diff --git a/configure b/configure
index 14411a6744e..a05cfd27283 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.452 .
+# From configure.in Revision: 1.453 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57 for python 2.4.
 #
@@ -14151,6 +14151,7 @@ main()
     hints.ai_family = AF_UNSPEC;
     hints.ai_flags = passive ? AI_PASSIVE : 0;
     hints.ai_socktype = SOCK_STREAM;
+    hints.ai_protocol = IPPROTO_TCP;
     if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
       (void)gai_strerror(gaierr);
       goto bad;
diff --git a/configure.in b/configure.in
index 46e290a1099..70f11091f3a 100644
--- a/configure.in
+++ b/configure.in
@@ -2214,6 +2214,7 @@ main()
     hints.ai_family = AF_UNSPEC;
     hints.ai_flags = passive ? AI_PASSIVE : 0;
     hints.ai_socktype = SOCK_STREAM;
+    hints.ai_protocol = IPPROTO_TCP;
     if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {
       (void)gai_strerror(gaierr);
       goto bad;