diff --git a/CHANGES b/CHANGES
index 3ef741b..ede6660 100644
--- a/CHANGES
+++ b/CHANGES
@@ -37,6 +37,10 @@ corrections:
 	to a random port instead of terminating with error.
 	Test: TCP4_NOPORT
 
+porting:
+	Socat included <sys/poll.h> instead of POSIX <poll.h>
+	Thanks to John Spencer for reporting this issue.
+
 ####################### V 1.7.2.4:
 
 corrections:
diff --git a/config.h.in b/config.h.in
index 99310f0..008ef99 100644
--- a/config.h.in
+++ b/config.h.in
@@ -185,6 +185,9 @@
 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H
 
+/* Define if you have the <poll.h> header file.  */
+#undef HAVE_POLL_H
+
 /* Define if you have the <sys/poll.h> header file.  */
 #undef HAVE_SYS_POLL_H
 
diff --git a/configure.in b/configure.in
index 05f9b67..57140b6 100644
--- a/configure.in
+++ b/configure.in
@@ -60,7 +60,7 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS(inttypes.h)
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h sys/time.h syslog.h unistd.h)
-AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
+AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
 AC_CHECK_HEADERS(pty.h)
 AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
 AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT
diff --git a/sysincludes.h b/sysincludes.h
index c70a708..9635f12 100644
--- a/sysincludes.h
+++ b/sysincludes.h
@@ -54,7 +54,9 @@
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>	/* pid_t, select(), socket(), connect(), open(), u_short */
 #endif
-#if HAVE_SYS_POLL_H
+#if HAVE_POLL_H
+#include <poll.h>	/* poll() */
+#elif HAVE_SYS_POLL_H
 #include <sys/poll.h>	/* poll() */
 #endif
 #if HAVE_SYS_SOCKET_H