diff --git a/ChangeLog b/ChangeLog
index 7ab5e9562d..53aad77a35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-16  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* ext/timidity/Makefile.am:
+	Dist all source files, no matter if only timidity or wildmidi or
+	nothing is found by configure. Fixes bug #528000.
+
 2008-04-14  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst-plugins-bad.spec.in:
diff --git a/common b/common
index f88ff852da..3bb6edfe92 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit f88ff852da7631ad2d0be835763da6d551a63883
+Subproject commit 3bb6edfe927d6d3020d2f2a4604f54caa61cd104
diff --git a/ext/timidity/Makefile.am b/ext/timidity/Makefile.am
index 7364def90a..6d6f4662b4 100644
--- a/ext/timidity/Makefile.am
+++ b/ext/timidity/Makefile.am
@@ -12,9 +12,6 @@ libgsttimidity_la_SOURCES = gsttimidity.c
 libgsttimidity_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(TIMIDITY_CFLAGS)
 libgsttimidity_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(TIMIDITY_LIBS)
 libgsttimidity_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = gsttimidity.h
-
 endif
 
 if USE_WILDMIDI
@@ -28,6 +25,7 @@ libgstwildmidi_la_SOURCES = gstwildmidi.c
 libgstwildmidi_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(WILDMIDI_CFLAGS)
 libgstwildmidi_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(WILDMIDI_LIBS)
 libgstwildmidi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-noinst_HEADERS = gstwildmidi.h
 endif
+
+noinst_HEADERS = gsttimidity.h gstwildmidi.h
+