diff --git a/ChangeLog b/ChangeLog
index c0730f6bb9..2d23e58d59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-17  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* configure.ac:
+	  Enable flx plugin.
+
+	* gst/flx/gstflxdec.c: (flx_decode_chunks):
+	  Fix gcc4 signedness issue.
+
 2005-10-17  Julien MOUTTE  <julien@moutte.net>
 
 	* configure.ac: Adding videomixer.
diff --git a/configure.ac b/configure.ac
index 5a6092bcdf..3a2916b9aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -272,6 +272,7 @@ GST_PLUGINS_ALL="\
 		avi \
 		debug \
 		effectv \
+		flx \
 		goom \
 		law \
 		level \
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index f4d9bf0c0c..36d9903fa2 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -205,7 +205,8 @@ gst_flxdec_sink_event_handler (GstPad * pad, GstEvent * event)
 }
 
 static void
-flx_decode_chunks (GstFlxDec * flxdec, gulong count, gchar * data, gchar * dest)
+flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data,
+    guchar * dest)
 {
   FlxFrameChunk *hdr;