diff --git a/ChangeLog b/ChangeLog
index 244811d821..e6fc0394ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-24  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	Patch by: Emilio Pozuelo Monfort <pochu at ubuntu dot com>
+
+	* ext/Makefile.am:
+	Build the wildmidi plugin if it's enabled and not only when
+	both, the timidity and wildmidi plugin, are enabled.
+
 2008-02-23  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* configure.ac:
diff --git a/common b/common
index ce296a6e04..a574e6214b 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ce296a6e04ac824523dbf7bf836f91e14012ab9d
+Subproject commit a574e6214b06fcbdfc00e952e2f3edc06997ee93
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 419b27a9a0..108a55f2a8 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -202,6 +202,12 @@ else
 TIMIDITY_DIR=
 endif
 
+if USE_WILDMIDI
+TIMIDITY_DIR=timidity
+else
+TIMIDITY_DIR=
+endif
+
 # if USE_POLYP
 # POLYP_DIR=polyp
 # else