diff --git a/CHANGES b/CHANGES
index dacc1bb..fbe3618 100644
--- a/CHANGES
+++ b/CHANGES
@@ -39,6 +39,10 @@ Porting:
 	When NETDB_INTERNAL is not available it should be set to -1.
 	Thanks to Baruch Siach for sending a patch.
 
+	On OpenSolaris/Illumos, isastream() is declared only in stropts.h, not
+	in sys/stropts.h
+	Thanks to Andy Fiddaman for sending a patch.
+
 Building:
 	Makefile.in: procan.o build requires srcdir prefix for explicit source
 	file.
@@ -579,12 +583,12 @@ Porting:
 	Fixed ancillary messages on Solaris.
 
 	Filan: Solaris has the open file path infos in /proc/<pid>/path/
-	Thanks to Andy Fiddaman to directing me to the patch.
+	Thanks to Andy Fiddaman for directing me to the patch.
 
 	Filan now recognizes and prints Solaris doors and event ports.
 
 	Solaris derivatives no longer need librt for clock_gettime()
-	Thanks to Andy Fiddaman to directing me to the patch.
+	Thanks to Andy Fiddaman for directing me to the patch.
 
 	LibreSSL does not have OPENSSL_INIT_new(). This function is now
 	guarded. Socat might build with LibreSSL.
diff --git a/config.h.in b/config.h.in
index fed2f05..94cd199 100644
--- a/config.h.in
+++ b/config.h.in
@@ -315,8 +315,8 @@
 /* Define if you have the <libutil.h> header file. (FreeBSD: openpty()) */
 #undef HAVE_LIBUTIL_H
 
-/* Define if you have the <sys/stropts.h> header file. (stream opts on SunOS)*/
-#undef HAVE_SYS_STROPTS_H
+/* Define if you have the <stropts.h> header file. (stream opts on SunOS)*/
+#undef HAVE_STROPTS_H
 
 /* Define if you have the <regex.h> header file. */
 #undef HAVE_REGEX_H
diff --git a/configure.ac b/configure.ac
index dba0cc0..3e49a81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ AC_CHECK_HEADERS(linux/types.h)
 AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include <sys/time.h>
 #include <linux/types.h>])
 AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
-AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
+AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h stropts.h regex.h)
 AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h)
 
 dnl Checks for setgrent, getgrent and endgrent.
diff --git a/sysincludes.h b/sysincludes.h
index 0c2aff3..f51e368 100644
--- a/sysincludes.h
+++ b/sysincludes.h
@@ -167,8 +167,8 @@
 #elif HAVE_LIBUTIL_H
 #include <libutil.h>		/* FreeBSD openpty() */
 #endif
-#if HAVE_SYS_STROPTS_H
-#include <sys/stropts.h>	/* SunOS I_PUSH ... */
+#if HAVE_STROPTS_H
+#include <stropts.h>		/* SunOS I_PUSH ... */
 #endif
 #if HAVE_REGEX_H
 #include <regex.h>