diff --git a/ChangeLog b/ChangeLog
index 37dc76b4a2..dd783ce88c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-23  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst-libs/gst/Makefile.am:
+	  Need to build tag directory before cdda.
+
 2006-09-23  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* docs/libs/gst-plugins-base-libs-sections.txt:
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index 1bfcc75899..8ac6dc7292 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -1,15 +1,16 @@
 # The interfaces directory has to be built before the others,
 # otherwise some generated header files will be missing for the
 # plugins in the other directories.
+# Also, the tag directory has to be built before the cdda directory.
 SUBDIRS = \
 	interfaces \
+	tag \
 	audio \
 	cdda \
 	floatcast \
 	netbuffer \
 	riff \
 	rtp \
-	tag \
 	video
 
 noinst_HEADERS = gettext.h gst-i18n-plugin.h