diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index a5e0345c9a23e9a3d53d543f99dfd6fc20efb970..546086796d78e3818917ebabd61361be00b2eb98 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -454,6 +454,7 @@ ifdef ENABLE_IPV6
 	@echo $(DL)#define ENABLE_IPV6 1$(DL) >> $@
 	@echo $(DL)#define HAVE_FREEADDRINFO 1$(DL) >> $@
 	@echo $(DL)#define HAVE_GETADDRINFO 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SIN6_SCOPE_ID 1$(DL) >> $@
 endif
 endif
 	@echo $(DL)#define USE_MANUAL 1$(DL) >> $@
diff --git a/lib/config-os400.h b/lib/config-os400.h
index 3a118796ac06c04a6dd8dfd62d7ee3d5cb1cc6ab..dccf8a869e4bc61b2a0fa721bb949652b3e0691d 100644
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -42,6 +42,9 @@
 /* Define if you want to enable IPv6 support */
 #define ENABLE_IPV6
 
+/* Define if struct sockaddr_in6 has the sin6_scope_id member */
+#define HAVE_SIN6_SCOPE_ID 1
+
 /* Define this to 'int' if ssize_t is not an available typedefed type */
 #undef ssize_t
 
diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index 82d579e53ab290e1edc399bfd5cb22f8417b93ae..25097fb0bcfdb75b4df04232ff8b57ab7e189399 100644
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -38,6 +38,9 @@
 /* Define if you want to enable IPv6 support */
 #undef ENABLE_IPV6
 
+/* Define if struct sockaddr_in6 has the sin6_scope_id member */
+#define HAVE_SIN6_SCOPE_ID 1
+
 /* Define this to 'int' if ssize_t is not an available typedefed type */
 #undef ssize_t
 
diff --git a/lib/config-symbian.h b/lib/config-symbian.h
index fb5dd23aae1c1692fe04aa63d7cc71e64931ec31..cc9b03cb956db0a141db3ac5f312fa5e216a4a66 100644
--- a/lib/config-symbian.h
+++ b/lib/config-symbian.h
@@ -66,6 +66,9 @@
 /* Define if you want to enable IPv6 support */
 #define ENABLE_IPV6 1
 
+/* Define if struct sockaddr_in6 has the sin6_scope_id member */
+#define HAVE_SIN6_SCOPE_ID 1
+
 /* Define to the type qualifier of arg 1 for getnameinfo. */
 #define GETNAMEINFO_QUAL_ARG1 const
 
diff --git a/lib/config-tpf.h b/lib/config-tpf.h
index 67f9cbfefd0355a2ee3ac316e75a65cea4f75453..8524cda190689c55f743bc4faf60f7cbcaa3701e 100644
--- a/lib/config-tpf.h
+++ b/lib/config-tpf.h
@@ -62,6 +62,9 @@
 /* Define if you want to enable IPv6 support */
 /* #undef ENABLE_IPV6 */
 
+/* Define if struct sockaddr_in6 has the sin6_scope_id member */
+/* #undef HAVE_SIN6_SCOPE_ID */
+
 /* Define to the type of arg 1 for getnameinfo. */
 /* #undef GETNAMEINFO_TYPE_ARG1 */
 
diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index cd793d6ccf367edafdb8b293552e87103e2bceb5..65b00a10447f6fa75f3928eb6dc87cd7358a2484 100644
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -323,6 +323,9 @@
 /* Define this if you have struct timeval */
 #define HAVE_STRUCT_TIMEVAL 1
 
+/* Define this if struct sockaddr_in6 has the sin6_scope_id member */
+#define HAVE_SIN6_SCOPE_ID 1
+
 /* ---------------------------------------------------------------- */
 /*                        COMPILER SPECIFIC                         */
 /* ---------------------------------------------------------------- */
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 6b02935f2bf26cbe83d4e38ce8281f37d71d46ac..6be299cf805bf3cf2603da6321decef6891cada6 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -442,6 +442,7 @@ ifdef ENABLE_IPV6
 	@echo $(DL)#define ENABLE_IPV6 1$(DL) >> $@
 	@echo $(DL)#define HAVE_FREEADDRINFO 1$(DL) >> $@
 	@echo $(DL)#define HAVE_GETADDRINFO 1$(DL) >> $@
+	@echo $(DL)#define HAVE_SIN6_SCOPE_ID 1$(DL) >> $@
 endif
 endif
 	@echo $(DL)#define USE_MANUAL 1$(DL) >> $@
diff --git a/src/config-riscos.h b/src/config-riscos.h
index f8df38ed5c6f546733b91b2ea35f9a24a479721b..0e6b3a19be7b703821f51075b9fb08b9b1003f3a 100644
--- a/src/config-riscos.h
+++ b/src/config-riscos.h
@@ -41,6 +41,9 @@
 /* Define if you want to enable IPv6 support */
 #undef ENABLE_IPV6
 
+/* Define if struct sockaddr_in6 has the sin6_scope_id member */
+#define HAVE_SIN6_SCOPE_ID 1
+
 /* Define this to 'int' if ssize_t is not an available typedefed type */
 #undef ssize_t
 
diff --git a/src/config-win32.h b/src/config-win32.h
index 0ca61cccf834f338d630e1f51833dd647da1cda9..3b7dc58e8a9b2c9aeee75dc53657ab0466534296 100644
--- a/src/config-win32.h
+++ b/src/config-win32.h
@@ -200,6 +200,9 @@
 /* Define this if you have struct timeval */
 #define HAVE_STRUCT_TIMEVAL 1
 
+/* Define this if struct sockaddr_in6 has the sin6_scope_id member */
+#define HAVE_SIN6_SCOPE_ID 1
+
 /* ---------------------------------------------------------------- */
 /*                        Watt-32 tcp/ip SPECIFIC                   */
 /* ---------------------------------------------------------------- */