diff --git a/ChangeLog b/ChangeLog
index baebcd98f..de37a0ba7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
  - (dtucker) [openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Bug #796:
    Restore previous authdb setting after auth calls.  Fixes problems with
    setpcred failing on accounts that use AFS or NIS password registries.
+ - (dtucker) [configure.ac includes.h] Include <sys/stream.h> if present,
+   required on Solaris 2.5.1 for queue_t, which is used by <sys/ptms.h>.
  - (dtucker) OpenBSD CVS Sync
    - markus@cvs.openbsd.org 2004/01/30 09:48:57
      [auth-passwd.c auth.h pathnames.h session.c]
@@ -1809,4 +1811,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3214 2004/02/06 05:41:37 dtucker Exp $
+$Id: ChangeLog,v 1.3215 2004/02/06 10:29:41 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 64645217d..bdff63db3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.193 2004/02/06 05:24:31 dtucker Exp $
+# $Id: configure.ac,v 1.194 2004/02/06 10:29:42 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -494,7 +494,7 @@ AC_CHECK_HEADERS(bstring.h crypt.h endian.h features.h floatingpoint.h \
 	rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
 	strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \
 	sys/cdefs.h sys/mman.h sys/pstat.h sys/ptms.h sys/select.h sys/stat.h \
-	sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h \
+	sys/stream.h sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h \
 	sys/un.h time.h tmpdir.h ttyent.h usersec.h \
 	util.h utime.h utmp.h utmpx.h vis.h)
 
diff --git a/includes.h b/includes.h
index d2cc88213..ca943c7e6 100644
--- a/includes.h
+++ b/includes.h
@@ -135,6 +135,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #include <sys/strtio.h>	/* for TIOCCBRK on HP-UX */
 #endif
 #if defined(HAVE_SYS_PTMS_H) && defined(HAVE_DEV_PTMX)
+# if defined(HAVE_SYS_STREAM_H)
+#  include <sys/stream.h>	/* reqd for queue_t on Solaris 2.5.1 */
+# endif
 #include <sys/ptms.h>	/* for grantpt() and friends */
 #endif