diff --git a/ChangeLog b/ChangeLog
index f9d8279775..a3d8d9a02f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-05  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/matroska/Makefile.am:
+	  If zlib is available and used, we must link it explicitly for
+	  things to work on MingW (fixes #392855).
+
 2007-01-04  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/esd/esdsink.c: (gst_esdsink_delay):
diff --git a/gst/matroska/Makefile.am b/gst/matroska/Makefile.am
index 87e3d9e660..21dbb514c9 100644
--- a/gst/matroska/Makefile.am
+++ b/gst/matroska/Makefile.am
@@ -25,5 +25,6 @@ libgstmatroska_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_LIBS) \
-	-lgstriff-@GST_MAJORMINOR@
+	-lgstriff-@GST_MAJORMINOR@ \
+	$(ZLIB_LIBS)
 libgstmatroska_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)