diff --git a/PORTED_09 b/PORTED_09
index 7922bb0dce..92c40fa8ce 100644
--- a/PORTED_09
+++ b/PORTED_09
@@ -8,6 +8,7 @@ aalib	(wim)
 libcaca	(zeeshan)
 law	(wim)
 shout2  (zaheer) - not fully tested
+esdsink (arwed)
 
 osssink is partially done in the threaded branch (wim)
 
diff --git a/configure.ac b/configure.ac
index 81efea0b74..2cdd92edcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -420,6 +420,18 @@ GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
 ])
 AC_SUBST(MAD_LIBS)
 
+dnl **** ESound ****
+translit(dnm, m, l) AM_CONDITIONAL(USE_ESD, true)
+GST_CHECK_FEATURE(ESD, [esound plug-ins], esdsink, [
+  PKG_CHECK_MODULES(ESD, esound >= 0.2.12, [
+    HAVE_ESD="yes"
+    AC_SUBST(ESD_CFLAGS)
+    AC_SUBST(ESD_LIBS)
+  ], [
+    AM_PATH_ESD(0.2.12, HAVE_ESD="yes", HAVE_ESD="no")
+    AS_SCRUB_INCLUDE(ESD_CFLAGS)
+  ])
+])
 
 AC_SUBST(GST_LIBS)
 AC_SUBST(GST_CFLAGS)
@@ -484,6 +496,7 @@ ext/libcaca/Makefile
 ext/mad/Makefile
 ext/shout2/Makefile
 ext/sidplay/Makefile
+ext/esd/Makefile
 common/Makefile
 common/m4/Makefile
 m4/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 4dcefb2d64..aaffd83b0c 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -94,11 +94,11 @@ endif
 # DVDNAV_DIR=
 # endif
 
-# if USE_ESD
-# ESD_DIR=esd
-# else
-# ESD_DIR=
-# endif
+if USE_ESD
+ESD_DIR=esd
+else
+ESD_DIR=
+endif
 
 # if USE_FAAC
 # FAAC_DIR=faac