diff --git a/ChangeLog b/ChangeLog
index be3b7addbb..4cf6f8e8c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-24  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/xvid/gstxvidenc.c: (gst_xvidenc_set_property),
+	(gst_xvidenc_get_property):
+	  ulong/int mess-up.
+
 2004-03-24  David Schleef  <ds@schleef.org>
 
 	* ext/speex/gstspeexdec.c: (gst_speexdec_base_init),
diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c
index db9d1add34..aa129bc447 100644
--- a/ext/xvid/gstxvidenc.c
+++ b/ext/xvid/gstxvidenc.c
@@ -434,7 +434,7 @@ gst_xvidenc_set_property (GObject * object,
       xvidenc->bitrate = g_value_get_int (value);
       break;
     case ARG_BUFSIZE:
-      xvidenc->buffer_size = g_value_get_int (value);
+      xvidenc->buffer_size = g_value_get_ulong (value);
       break;
     case ARG_MAXKEYINTERVAL:
       xvidenc->max_key_interval = g_value_get_int (value);
@@ -464,7 +464,7 @@ gst_xvidenc_get_property (GObject * object,
       g_value_set_int (value, xvidenc->bitrate);
       break;
     case ARG_BUFSIZE:
-      g_value_set_int (value, xvidenc->buffer_size);
+      g_value_set_ulong (value, xvidenc->buffer_size);
       break;
     case ARG_MAXKEYINTERVAL:
       g_value_set_int (value, xvidenc->max_key_interval);