diff --git a/media/libvorbis/README_MOZILLA b/media/libvorbis/README_MOZILLA
index 939efb103eea..ea1b8b43d0b4 100644
--- a/media/libvorbis/README_MOZILLA
+++ b/media/libvorbis/README_MOZILLA
@@ -11,3 +11,4 @@ file names with other Mozilla libraries.
 alloca.diff - Bug 469639 - Failed to build firefox trunk on OpenSolaris
 bug487519.patch: fix for bug 487519.
 bug498855.patch: fix for bug 498855
+bug550184.patch: fix for bug 550184 (Xiph trac 1656)
diff --git a/media/libvorbis/bug550184.patch b/media/libvorbis/bug550184.patch
new file mode 100644
index 000000000000..2303030fbfc7
--- /dev/null
+++ b/media/libvorbis/bug550184.patch
@@ -0,0 +1,18 @@
+diff --git a/media/libvorbis/lib/vorbis_info.c b/media/libvorbis/lib/vorbis_info.c
+index 30088d8..8583224 100644
+--- a/media/libvorbis/lib/vorbis_info.c
++++ b/media/libvorbis/lib/vorbis_info.c
+@@ -628,12 +628,12 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v,
+   oggpack_writeclear(&opb);
+   return(0);
+  err_out:
+-  oggpack_writeclear(&opb);
+   memset(op,0,sizeof(*op));
+   memset(op_comm,0,sizeof(*op_comm));
+   memset(op_code,0,sizeof(*op_code));
+ 
+   if(b){
++    oggpack_writeclear(&opb);
+     if(b->header)_ogg_free(b->header);
+     if(b->header1)_ogg_free(b->header1);
+     if(b->header2)_ogg_free(b->header2);
diff --git a/media/libvorbis/lib/vorbis_info.c b/media/libvorbis/lib/vorbis_info.c
index 30088d8f04c5..8583224d1fd9 100644
--- a/media/libvorbis/lib/vorbis_info.c
+++ b/media/libvorbis/lib/vorbis_info.c
@@ -628,12 +628,12 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v,
   oggpack_writeclear(&opb);
   return(0);
  err_out:
-  oggpack_writeclear(&opb);
   memset(op,0,sizeof(*op));
   memset(op_comm,0,sizeof(*op_comm));
   memset(op_code,0,sizeof(*op_code));
 
   if(b){
+    oggpack_writeclear(&opb);
     if(b->header)_ogg_free(b->header);
     if(b->header1)_ogg_free(b->header1);
     if(b->header2)_ogg_free(b->header2);
diff --git a/media/libvorbis/update.sh b/media/libvorbis/update.sh
index 3a8bd13fafcc..5ca413a4e16e 100644
--- a/media/libvorbis/update.sh
+++ b/media/libvorbis/update.sh
@@ -49,3 +49,4 @@ cp $1/AUTHORS ./AUTHORS
 patch -p3 < ./alloca.diff
 patch -p3 <bug487519.patch
 patch -p3 <bug498855.patch
+patch -p3 <bug550184.patch