diff --git a/ChangeLog b/ChangeLog
index 163def2f82..c3a376b042 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-28  Wim Taymans  <wim@fluendo.com>
+
+	* gst/audioconvert/audioconvert.c: (float):
+	correctly clip float samples > 1.0. Fixes #338718
+
 2006-04-28  Tim-Philipp Müller  <tim at centricular dot net>
 
 	Patch by: Young-Ho Cha  <ganadist at chollian net>
diff --git a/gst/audioconvert/audioconvert.c b/gst/audioconvert/audioconvert.c
index 7531e69215..d689592742 100644
--- a/gst/audioconvert/audioconvert.c
+++ b/gst/audioconvert/audioconvert.c
@@ -58,11 +58,11 @@ MAKE_UNPACK_FUNC_NAME (float) (gpointer src, gint32 * dst,
     gint scale, gint count)
 {
   gfloat *p = (gfloat *) src;
-  gfloat temp;
+  gint64 temp;
 
   for (; count; count--) {
-    temp = *p++ * 2147483647.0f + .5;
-    *dst++ = (gint32) CLAMP (temp, G_MININT, G_MAXINT);
+    temp = *p++ * 2147483647.0f;
+    *dst++ = (gint32) CLAMP (temp, G_MININT32, G_MAXINT32);
   }
 }