diff --git a/build/php.m4 b/build/php.m4
index 74c069f5887b..83375bec5aa2 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -1396,7 +1396,11 @@ AC_DEFUN([PHP_POLL_MECHANISMS],
     AC_DEFINE([HAVE_EPOLL], [1], [Define if epoll is available])
     poll_mechanisms="$poll_mechanisms epoll"
 
-    AC_CHECK_FUNCS([epoll_pwait2], [], [], [#include <sys/epoll.h>])
+    AC_CHECK_FUNCS([epoll_pwait2], [],
+      [AC_CHECK_DECL([epoll_pwait2],
+        [AC_DEFINE([HAVE_EPOLL_PWAIT2], [1])],
+        [],
+        [#include <sys/epoll.h>])])
   ])
 
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
diff --git a/configure.ac b/configure.ac
index 63c00f508c1c..b61b909b67b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1817,6 +1817,7 @@ AC_DEFINE([HAVE_BUILD_DEFS_H], [1],
 
 PHP_ADD_BUILD_DIR([
   main
+  main/poll
   main/streams
   scripts
   scripts/man1