diff --git a/ChangeLog b/ChangeLog
index b07f9c0a60..08d89fe487 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-18  Andy Wingo  <wingo@pobox.com>
+
+	* gst/base/gstbasesrc.c (gst_basesrc_set_property) 
+	(gst_basesrc_get_property): BLOCKSIZE is a ULONG. Rename ARG_...
+	to PROP_....
+
 2005-04-14  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* docs/faq/using.xml:
diff --git a/gst/base/gstbasesrc.c b/gst/base/gstbasesrc.c
index 47b259ce9b..2ead5b1d9b 100644
--- a/gst/base/gstbasesrc.c
+++ b/gst/base/gstbasesrc.c
@@ -46,8 +46,8 @@ enum
 
 enum
 {
-  ARG_0,
-  ARG_BLOCKSIZE,
+  PROP_0,
+  PROP_BLOCKSIZE,
 };
 
 static GstElementClass *parent_class = NULL;
@@ -124,7 +124,7 @@ gst_basesrc_class_init (GstBaseSrcClass * klass)
   gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_basesrc_set_property);
   gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_basesrc_get_property);
 
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BLOCKSIZE,
+  g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_BLOCKSIZE,
       g_param_spec_ulong ("blocksize", "Block size",
           "Size in bytes to read per buffer", 1, G_MAXULONG, DEFAULT_BLOCKSIZE,
           G_PARAM_READWRITE));
@@ -399,8 +399,8 @@ gst_basesrc_set_property (GObject * object, guint prop_id, const GValue * value,
   src = GST_BASESRC (object);
 
   switch (prop_id) {
-    case ARG_BLOCKSIZE:
-      src->blocksize = g_value_get_int (value);
+    case PROP_BLOCKSIZE:
+      src->blocksize = g_value_get_ulong (value);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -417,8 +417,8 @@ gst_basesrc_get_property (GObject * object, guint prop_id, GValue * value,
   src = GST_BASESRC (object);
 
   switch (prop_id) {
-    case ARG_BLOCKSIZE:
-      g_value_set_int (value, src->blocksize);
+    case PROP_BLOCKSIZE:
+      g_value_set_ulong (value, src->blocksize);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
index 47b259ce9b..2ead5b1d9b 100644
--- a/libs/gst/base/gstbasesrc.c
+++ b/libs/gst/base/gstbasesrc.c
@@ -46,8 +46,8 @@ enum
 
 enum
 {
-  ARG_0,
-  ARG_BLOCKSIZE,
+  PROP_0,
+  PROP_BLOCKSIZE,
 };
 
 static GstElementClass *parent_class = NULL;
@@ -124,7 +124,7 @@ gst_basesrc_class_init (GstBaseSrcClass * klass)
   gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_basesrc_set_property);
   gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_basesrc_get_property);
 
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BLOCKSIZE,
+  g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_BLOCKSIZE,
       g_param_spec_ulong ("blocksize", "Block size",
           "Size in bytes to read per buffer", 1, G_MAXULONG, DEFAULT_BLOCKSIZE,
           G_PARAM_READWRITE));
@@ -399,8 +399,8 @@ gst_basesrc_set_property (GObject * object, guint prop_id, const GValue * value,
   src = GST_BASESRC (object);
 
   switch (prop_id) {
-    case ARG_BLOCKSIZE:
-      src->blocksize = g_value_get_int (value);
+    case PROP_BLOCKSIZE:
+      src->blocksize = g_value_get_ulong (value);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -417,8 +417,8 @@ gst_basesrc_get_property (GObject * object, guint prop_id, GValue * value,
   src = GST_BASESRC (object);
 
   switch (prop_id) {
-    case ARG_BLOCKSIZE:
-      g_value_set_int (value, src->blocksize);
+    case PROP_BLOCKSIZE:
+      g_value_set_ulong (value, src->blocksize);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);