diff --git a/configure.ac b/configure.ac
index d6e681c14..464b56b62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,6 +117,12 @@ AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [Def
 
 AC_CHECK_LIB([ncurses], [setupterm])
 
+AC_ARG_VAR([poll_CFLAGS], [C compiler flags for poll])
+AC_ARG_VAR([poll_LIBS], [linker flags for poll])
+if test -z "$poll_LIBS"; then
+   AC_CHECK_LIB([poll], [poll], [poll_LIBS="-lpoll"])
+fi
+
 AC_CHECK_DECLS([__builtin_bswap64, __builtin_ctz])
 
 AC_CHECK_DECL([mach_absolute_time],
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index a9fa36350..a284a20b3 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -14,12 +14,12 @@ decrypt_CPPFLAGS = -I$(srcdir)/../crypto
 decrypt_LDADD = ../crypto/libmoshcrypto.a
 
 parse_SOURCES = parse.cc
-parse_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util
-parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a -lutil $(BOOST_LDFLAGS)
+parse_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util $(poll_CFLAGS)
+parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a -lutil $(BOOST_LDFLAGS) $(poll_LIBS)
 
 termemu_SOURCES = termemu.cc
-termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I../protobufs
-termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a -lutil $(BOOST_LDFLAGS) $(protobuf_LIBS)
+termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I../protobufs $(poll_CFLAGS)
+termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a -lutil $(BOOST_LDFLAGS) $(protobuf_LIBS) $(poll_LIBS)
 if COND_THIRD_LIBSTDDJB
   termemu_CPPFLAGS += -I$(top_srcdir)/third/libstddjb
   termemu_LDADD += $(top_builddir)/third/libstddjb/libstddjb.a
@@ -29,12 +29,12 @@ else
 endif
 
 ntester_SOURCES = ntester.cc
-ntester_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs $(BOOST_CPPFLAGS)
-ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a -lutil -lm $(BOOST_LDFLAGS) $(protobuf_LIBS)
+ntester_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs $(BOOST_CPPFLAGS) $(poll_CFLAGS)
+ntester_LDADD = ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../protobufs/libmoshprotos.a $(poll_LIBS) -lutil -lm $(BOOST_LDFLAGS) $(protobuf_LIBS)
 
 benchmark_SOURCES = benchmark.cc
-benchmark_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I../protobufs -I$(srcdir)/../frontend -I$(srcdir)/../crypto $(BOOST_CPPFLAGS) -I$(srcdir)/../network
-benchmark_LDADD = ../frontend/terminaloverlay.o ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../protobufs/libmoshprotos.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util/libmoshutil.a -lutil -lm $(BOOST_LDFLAGS) $(protobuf_LIBS)
+benchmark_CPPFLAGS = -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I../protobufs -I$(srcdir)/../frontend -I$(srcdir)/../crypto $(BOOST_CPPFLAGS) -I$(srcdir)/../network $(poll_CFLAGS)
+benchmark_LDADD = ../frontend/terminaloverlay.o ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../protobufs/libmoshprotos.a ../network/libmoshnetwork.a ../crypto/libmoshcrypto.a ../util/libmoshutil.a $(poll_LIBS) -lutil -lm $(BOOST_LDFLAGS) $(protobuf_LIBS)
 if COND_THIRD_LIBSTDDJB
   benchmark_CPPFLAGS += -I$(top_srcdir)/third/libstddjb
   benchmark_LDADD += $(top_builddir)/third/libstddjb/libstddjb.a
diff --git a/src/examples/benchmark.cc b/src/examples/benchmark.cc
index 7bd993db0..923c3c975 100644
--- a/src/examples/benchmark.cc
+++ b/src/examples/benchmark.cc
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <poll.h>
+#include <sys/poll.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <pwd.h>
diff --git a/src/examples/ntester.cc b/src/examples/ntester.cc
index 00dbbd37e..878d82440 100644
--- a/src/examples/ntester.cc
+++ b/src/examples/ntester.cc
@@ -18,7 +18,7 @@
 
 #include <termios.h>
 #include <unistd.h>
-#include <poll.h>
+#include <sys/poll.h>
 
 #include "user.h"
 #include "fatal_assert.h"
diff --git a/src/examples/parse.cc b/src/examples/parse.cc
index 9725e81f3..87e3adb8b 100644
--- a/src/examples/parse.cc
+++ b/src/examples/parse.cc
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <errno.h>
-#include <poll.h>
+#include <sys/poll.h>
 #include <string.h>
 #include <locale.h>
 #include <wchar.h>
diff --git a/src/examples/termemu.cc b/src/examples/termemu.cc
index a40b58464..eb4e93b4b 100644
--- a/src/examples/termemu.cc
+++ b/src/examples/termemu.cc
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <errno.h>
-#include <poll.h>
+#include <sys/poll.h>
 #include <string.h>
 #include <locale.h>
 #include <wchar.h>
diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am
index 1f86d217d..3716586c2 100644
--- a/src/frontend/Makefile.am
+++ b/src/frontend/Makefile.am
@@ -1,6 +1,6 @@
-AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(BOOST_CPPFLAGS) $(protobuf_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(BOOST_CPPFLAGS) $(protobuf_CFLAGS) $(poll_CFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) -fno-default-inline -pipe
-LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(protobuf_LIBS)
+LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a $(poll_LIBS) -lm $(protobuf_LIBS)
 if COND_THIRD_LIBSTDDJB
   AM_CPPFLAGS += -I$(top_srcdir)/third/libstddjb
   LDADD += $(top_builddir)/third/libstddjb/libstddjb.a
diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc
index 46379caa2..f45d47dfd 100644
--- a/src/frontend/mosh-server.cc
+++ b/src/frontend/mosh-server.cc
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <poll.h>
+#include <sys/poll.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <pwd.h>
diff --git a/src/frontend/stmclient.cc b/src/frontend/stmclient.cc
index b0e5ca640..2e2414f54 100644
--- a/src/frontend/stmclient.cc
+++ b/src/frontend/stmclient.cc
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <poll.h>
+#include <sys/poll.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <pwd.h>