diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27c08c58..2fab36e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@ if (WIN32)
 endif (WIN32)
 
 include(GNUInstallDirs)
+include(CheckSymbolExists)
 
 option(WITH_BUNDLED_DEPS "Build with bundled dependencies?" ON)
 option(WITH_TLS
@@ -89,6 +90,11 @@ if (WITH_DLT)
 	add_definitions("-DWITH_DLT")
 endif (WITH_DLT)
 
+check_symbol_exists(epoll_create "sys/epoll.h" HAVE_EPOLL)
+if (HAVE_EPOLL)
+	add_definitions("-DWITH_EPOLL")
+endif (HAVE_EPOLL)
+
 # ========================================
 # Include projects
 # ========================================
diff --git a/ChangeLog.txt b/ChangeLog.txt
index d8e32d44..ffed291c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -25,6 +25,9 @@ Apps:
 - Perform stricter parsing of input username in mosquitto_passwd. Closes
   #570126 (Eclipse bugzilla).
 
+Build:
+- Enable epoll support in CMake builds.
+
 
 1.6.12 - 2020-08-19
 ===================