diff --git a/ChangeLog b/ChangeLog
index 1876ac87b1..c5ec5a14e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-04  Andy Wingo  <wingo@pobox.com>
+
+	* ext/theora/theoradec.c (theora_handle_data_packet): This value
+	is often negative -- make it signed so as not to wrap around.
+	Fixes segfaults introduced on 9 March.
+
 2006-04-03  Wim Taymans  <wim@fluendo.com>
 
 	* ext/theora/gsttheoradec.h:
diff --git a/ext/theora/theoradec.c b/ext/theora/theoradec.c
index aea6efdad3..7dbc490d5b 100644
--- a/ext/theora/theoradec.c
+++ b/ext/theora/theoradec.c
@@ -969,7 +969,7 @@ theora_handle_data_packet (GstTheoraDec * dec, ogg_packet * packet,
     guchar *dest_y, *src_y;
     guchar *dest_u, *src_u;
     guchar *dest_v, *src_v;
-    guint offset;
+    gint offset;
 
     dest_y = GST_BUFFER_DATA (out);
     dest_u = dest_y + stride_y * height;