diff --git a/bower.json b/bower.json
index 31c7804f6..66be61ef9 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.892",
+  "version": "1.0.894",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index fa173f772..9edb85494 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.892';
-PDFJS.build = 'c8d729f';
+PDFJS.version = '1.0.894';
+PDFJS.build = '1f3ca3d';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.js b/build/pdf.js
index 9557a3672..0665c18cb 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.892';
-PDFJS.build = 'c8d729f';
+PDFJS.version = '1.0.894';
+PDFJS.build = '1f3ca3d';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.worker.js b/build/pdf.worker.js
index c4a5fb9c7..a5c2c76d7 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.892';
-PDFJS.build = 'c8d729f';
+PDFJS.version = '1.0.894';
+PDFJS.build = '1f3ca3d';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/package.json b/package.json
index f76af9575..8555242d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.892",
+  "version": "1.0.894",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",
diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js
index e76aeb564..60b5028d0 100644
--- a/web/pdf_viewer.js
+++ b/web/pdf_viewer.js
@@ -1839,8 +1839,10 @@ var PDFViewer = (function pdfViewer() {
             break;
           case 'auto':
             var isLandscape = (currentPage.width > currentPage.height);
-            var horizontalScale = isLandscape ? pageHeightScale :
-                                                pageWidthScale;
+            // For pages in landscape mode, fit the page height to the viewer
+            // *unless* the page would thus become too wide to fit horizontally.
+            var horizontalScale = isLandscape ?
+              Math.min(pageHeightScale, pageWidthScale) : pageWidthScale;
             scale = Math.min(MAX_AUTO_SCALE, horizontalScale);
             break;
           default: