diff --git a/ChangeLog b/ChangeLog
index 7dd8fd034d..e92b18b3e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-14  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_parse_packhead):
+	  Use our alignment-safe macros here too, since we can't assume that
+	  GST_BUFFER_DATA is aligned (these are subbuffers we're dealing with
+	  here).
+
 2006-12-14  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/realmedia/rmdemux.c: (gst_rmdemux_parse_indx_data):
diff --git a/gst/mpegstream/gstmpegparse.c b/gst/mpegstream/gstmpegparse.c
index f38999a8d8..5ba8b680a7 100644
--- a/gst/mpegstream/gstmpegparse.c
+++ b/gst/mpegstream/gstmpegparse.c
@@ -492,8 +492,8 @@ gst_mpeg_parse_parse_packhead (GstMPEGParse * mpeg_parse, GstBuffer * buffer)
   buf = GST_BUFFER_DATA (buffer);
   buf += 4;
 
-  scr1 = GUINT32_FROM_BE (*(guint32 *) buf);
-  scr2 = GUINT32_FROM_BE (*(guint32 *) (buf + 4));
+  scr1 = GST_READ_UINT32_BE (buf);
+  scr2 = GST_READ_UINT32_BE (buf + 4);
 
   /* Extract the SCR and rate values from the header. */
   if (GST_MPEG_PACKETIZE_IS_MPEG2 (mpeg_parse->packetize)) {