diff --git a/ChangeLog b/ChangeLog
index cb6000c29..b667e02e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
     pulls in modern socket prototypes and eliminates a number of compiler
     warnings.  see xopen_networking(7).
  - (stevesk) fix x11 forwarding from _PATH_XAUTH change
+ - (stevesk) use X/Open socket interface for HP-UX 10.X also
 
 20010625
  - OpenBSD CVS Sync
@@ -5808,4 +5809,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1333 2001/06/28 00:13:48 stevesk Exp $
+$Id: ChangeLog,v 1.1334 2001/06/28 00:24:41 stevesk Exp $
diff --git a/configure.in b/configure.in
index 04b70dd6c..f358f60a7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.294 2001/06/27 16:32:24 stevesk Exp $
+# $Id: configure.in,v 1.295 2001/06/28 00:24:42 stevesk Exp $
 
 AC_INIT(ssh.c)
 
@@ -78,13 +78,13 @@ case "$host" in
 	if test -z "$GCC"; then
 		CFLAGS="$CFLAGS -Ae"
 	fi
-	CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
+	CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
 	IPADDR_IN_DISPLAY=yes
 	AC_DEFINE(USE_PIPES)
 	AC_DEFINE(DISABLE_SHADOW)
 	AC_DEFINE(DISABLE_UTMP)
 	AC_DEFINE(SPT_TYPE,SPT_PSTAT)
-	LIBS="$LIBS -lsec"
+	LIBS="$LIBS -lxnet -lsec"
 	;;
 *-*-hpux11*)
 	CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"