diff --git a/CHANGES b/CHANGES
index 7831a39e7b28baec0ee3b636dfd3a8da76f84063..ccaeb0cf5bc433de2a52fa9f4f72cb2df0af652b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+? - ??
+- Can build with --disable-esd option
+
 0.8.4 - October 4, 2003
 - Added AIX sound driver from Stefan Tibus <sjti@gmx.net>
 - Committed some fixes from the Fink project to allow compiling on
diff --git a/configure.in b/configure.in
index a6767ef653395e6b577ba09eee1b43c1bd3302cd..de14b22ce714e4ca1e1ac14b1511000890bdc18d 100644
--- a/configure.in
+++ b/configure.in
@@ -174,8 +174,8 @@ AC_ARG_ENABLE(esd, [  --enable-esd            include ESD output plugin ],
 
 if test "$BUILD_ESD" = "yes"; then
   AM_PATH_ESD(0.2.8, have_esd=yes, have_esd=no)
-  AM_CONDITIONAL(HAVE_ESD,test "x$have_esd" = xyes)
 fi
+AM_CONDITIONAL(HAVE_ESD,test "x$have_esd" = xyes)
 
 
 dnl Check for OSS