diff --git a/CHANGES b/CHANGES
index 11346cefb0..6442467b14 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1024.	[port]		HP and Sun decided to use the same macros and
+			structures for different things.
+
 1023.	[func]		Accept hints without TTLs.
 
 1022.	[bug]		Allow hints to be completely empty.  [RT #1802]
diff --git a/configure.in b/configure.in
index b220e302a6..1d690e7fad 100644
--- a/configure.in
+++ b/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.302 $)
+AC_REVISION($Revision: 1.303 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -231,6 +231,27 @@ AC_TRY_COMPILE([],[long long i = 0; return (0);],
 		ISC_PLATFORM_HAVELONGLONG="#undef ISC_PLATFORM_HAVELONGLONG"])
 AC_SUBST(ISC_PLATFORM_HAVELONGLONG)
 
+#
+# check if we have lifconf
+#
+AC_MSG_CHECKING(for struct lifconf)
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/if.h>
+],
+[
+struct lifconf lifconf;
+lifconf.lifc_len = 0;
+]
+,
+	[AC_MSG_RESULT(yes)
+		ISC_PLATFORM_HAVELIFCONF="#define ISC_PLATFORM_HAVELIFCONF 1"],
+	[AC_MSG_RESULT(no)
+		ISC_PLATFORM_HAVELIFCONF="#undef ISC_PLATFORM_HAVELIFCONF"])
+AC_SUBST(ISC_PLATFORM_HAVELIFCONF)
+
+
 #
 # check if we need to #include sys/select.h explicitly
 #
diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 345f656713..b2e485d74d 100644
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h.in,v 1.24 2001/07/18 08:15:21 marka Exp $ */
+/* $Id: platform.h.in,v 1.25 2001/10/03 05:08:30 marka Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1
@@ -147,6 +147,12 @@
  */
 @ISC_PLATFORM_HAVELONGLONG@
 
+/*
+ * Define if the system has struct lifconf which is a extended struct ifconf
+ * for IPv6.
+ */
+@ISC_PLATFORM_HAVELIFCONF@
+
 /*
  * Used to control how extern data is linked; needed for Win32 platforms.
  */
diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index 2b0197c8f5..d5fa2b1f8d 100644
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -15,12 +15,21 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.21 2001/09/05 21:05:36 bwelling Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.22 2001/10/03 05:08:32 marka Exp $ */
 
 /*
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
  * See netintro(4).
  */
+
+#ifndef ISC_PLATFORM_HAVELIFCONF
+/*
+ * HP uses these differently to Sun.
+ */
+#undef SIOCGLIFCONF
+#undef SIOCGLIFADDR
+#endif
+
 #ifndef SIOCGLIFCONF
 #define SIOCGLIFCONF SIOCGIFCONF
 #define lifc_len ifc_len