diff --git a/media/libtheora/CHANGES b/media/libtheora/CHANGES
index f0b452885ccb..0665a2e6840e 100644
--- a/media/libtheora/CHANGES
+++ b/media/libtheora/CHANGES
@@ -1,6 +1,14 @@
-libtheora 1.1.1 (unreleased snapshot)
+libtheora 1.1.2 (unreleased snapshot)
 
- - No changes have been recorded
+ - no changes recorded
+
+libtheora 1.1.1 (2009 October 1)
+
+ - Fix problems with MSVC inline assembly
+ - Add the missing encoder_disabled.c to the distribution
+ - build updates: autogen.sh should work better after switching systems
+   and the MSVC project now defaults to the dynamic runtime library
+ - Namespace some variables to avoid conflicts on wince.
 
 libtheora 1.1.0 (2009 September 24)
 
diff --git a/media/libtheora/README b/media/libtheora/README
index 742162232cf4..135c62dd152a 100644
--- a/media/libtheora/README
+++ b/media/libtheora/README
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------
-             The Xiph.org Foundation's libtheora 1.1 beta release
+             The Xiph.org Foundation's libtheora 1.1 
 -------------------------------------------------------------------------
 
 *** What is Theora?
@@ -9,7 +9,7 @@ for use within the Foundation's Ogg multimedia streaming system.
 Theora is derived directly from On2's VP3 codec, adds new features
 while allow it a longer useful lifetime as an competitive codec.
 
-The 1.0 release decoder supports all the new features, but the
+The 1.0 release decoder supported all the new features, but the
 encoder is nearly identical to the VP3 code.
 
 The 1.1 release features a completely rewritten encoder, offering
diff --git a/media/libtheora/README_MOZILLA b/media/libtheora/README_MOZILLA
index e1d2c49b3fff..42f72e53c442 100644
--- a/media/libtheora/README_MOZILLA
+++ b/media/libtheora/README_MOZILLA
@@ -2,4 +2,4 @@ The source from this directory was copied from the theora subversion trunk
 using the update.sh script. The changes made were those applied by update.sh,
 the addition/update of Makefile.in files for the Mozilla build system.
 
-The subversion revision used was r16584.
+The subversion revision used was r16712.
diff --git a/media/libtheora/include/theora/config.h b/media/libtheora/include/theora/config.h
index af5618c0cef0..26e8fe6a036c 100644
--- a/media/libtheora/include/theora/config.h
+++ b/media/libtheora/include/theora/config.h
@@ -66,7 +66,7 @@
 #define PACKAGE_NAME "libtheora"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libtheora 1.1.0"
+#define PACKAGE_STRING "libtheora 1.1.1+svn"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libtheora"
@@ -75,7 +75,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.0"
+#define PACKAGE_VERSION "1.1.1+svn"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -87,4 +87,4 @@
 /* #undef THEORA_DISABLE_FLOAT */
 
 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "1.1.1+svn"
diff --git a/media/libtheora/lib/config.h b/media/libtheora/lib/config.h
index af5618c0cef0..26e8fe6a036c 100644
--- a/media/libtheora/lib/config.h
+++ b/media/libtheora/lib/config.h
@@ -66,7 +66,7 @@
 #define PACKAGE_NAME "libtheora"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libtheora 1.1.0"
+#define PACKAGE_STRING "libtheora 1.1.1+svn"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libtheora"
@@ -75,7 +75,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.0"
+#define PACKAGE_VERSION "1.1.1+svn"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -87,4 +87,4 @@
 /* #undef THEORA_DISABLE_FLOAT */
 
 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "1.1.1+svn"
diff --git a/media/libtheora/lib/huffdec.c b/media/libtheora/lib/huffdec.c
index 8cf27f034100..e063d0b8f8a1 100644
--- a/media/libtheora/lib/huffdec.c
+++ b/media/libtheora/lib/huffdec.c
@@ -11,7 +11,7 @@
  ********************************************************************
 
   function:
-    last mod: $Id: huffdec.c 16503 2009-08-22 18:14:02Z giles $
+    last mod: $Id: huffdec.c 16702 2009-11-15 00:40:55Z tterribe $
 
  ********************************************************************/
 
@@ -413,7 +413,7 @@ static oc_huff_node *oc_huff_tree_collapse(oc_huff_node *_binode,
   }
   while(occupancy>loccupancy&&occupancy>=1<<OC_MAXI(depth-OC_HUFF_SLUSH,0));
   depth--;
-  if(depth<=1)return oc_huff_tree_copy(_binode,_storage);
+  if(depth<=0)return oc_huff_tree_copy(_binode,_storage);
   size=oc_huff_node_size(depth);
   root=oc_huff_node_init(_storage,size,depth);
   root->depth=_binode->depth;