diff --git a/ChangeLog b/ChangeLog
index e6fc0394ed..c6fba0831e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-24  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* ext/Makefile.am:
+	Only disable the ext/timidity directory if both, wildmidi
+	_and_ timidity are not available.
+
 2008-02-24  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	Patch by: Emilio Pozuelo Monfort <pochu at ubuntu dot com>
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 108a55f2a8..ef399c5803 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -198,15 +198,17 @@ endif
 
 if USE_TIMIDITY
 TIMIDITY_DIR=timidity
-else
-TIMIDITY_DIR=
 endif
 
 if USE_WILDMIDI
 TIMIDITY_DIR=timidity
-else
+endif
+
+if !USE_WILDMIDI
+if !USE_TIMIDITY
 TIMIDITY_DIR=
 endif
+endif
 
 # if USE_POLYP
 # POLYP_DIR=polyp