diff --git a/configure.ac b/configure.ac
index 05c18b5e..51a016dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1011,7 +1011,7 @@ fi
 if test x$have_linux_epoll = xyes; then
   AC_DEFINE([DBUS_HAVE_LINUX_EPOLL], 1, [Define to use epoll(4) on Linux])
 fi
-AM_CONDITIONAL([HAVE_LINUX_EPOLL], [test x$have_linux_epoll = xyes])
+AM_CONDITIONAL([DBUS_HAVE_LINUX_EPOLL], [test x$have_linux_epoll = xyes])
 
 # kqueue checks
 if test x$enable_kqueue = xno ; then
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index e4a7f5a8..c003b399 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -120,7 +120,7 @@ DBUS_UTIL_arch_sources = 			\
 	$(NULL)
 endif
 
-if HAVE_LINUX_EPOLL
+if DBUS_HAVE_LINUX_EPOLL
 DBUS_UTIL_arch_sources += dbus-socket-set-epoll.c
 endif