diff --git a/ChangeLog b/ChangeLog
index a8d2211120..97fc232263 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-25  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Peter Kjellerstedt  <pkj at axis com>
+
+	* gst/playback/test.c:
+	  Fix compilation with uClibc and -Werror (#357591).
+
 2006-09-25  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst-libs/gst/tag/gstvorbistag.c: (gst_vorbis_tag_add):
diff --git a/gst/playback/test.c b/gst/playback/test.c
index 63441454c6..0ae17fe37c 100644
--- a/gst/playback/test.c
+++ b/gst/playback/test.c
@@ -22,6 +22,8 @@
 #endif
 #include <gst/gst.h>
 
+#include <stdlib.h>
+
 static GMainLoop *loop;
 
 static GstElement *