diff --git a/bower.json b/bower.json
index af28b2054..dda1ba699 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.114",
+  "version": "1.0.117",
   "keywords": [
     "Mozilla",
     "pdf",
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index 44ec891d2..d29285bd5 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.114';
-PDFJS.build = '8e517b6';
+PDFJS.version = '1.0.117';
+PDFJS.build = '6a800eb';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.js b/build/pdf.js
index cc42b51d9..9d0328585 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.114';
-PDFJS.build = '8e517b6';
+PDFJS.version = '1.0.117';
+PDFJS.build = '6a800eb';
 
 (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 1cf740af6..6e47609b5 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.0.114';
-PDFJS.build = '8e517b6';
+PDFJS.version = '1.0.117';
+PDFJS.build = '6a800eb';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/package.json b/package.json
index b2df71325..8984be0b2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.114",
+  "version": "1.0.117",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",
diff --git a/web/compatibility.js b/web/compatibility.js
index 21ac29fc5..31b6356fd 100644
--- a/web/compatibility.js
+++ b/web/compatibility.js
@@ -547,13 +547,20 @@ if (typeof PDFJS === 'undefined') {
       return;
     }
   } catch (e) { }
-  window.localStorage = {
-    data: Object.create(null),
-    getItem: function (key) {
-      return this.data[key];
-    },
-    setItem: function (key, value) {
-      this.data[key] = value;
-    }
-  };
+  // When the generic viewer is used in Firefox the following code will fail
+  // when the preference 'network.cookie.lifetimePolicy' is set to 1,
+  // see Mozilla bug 365772.
+  try {
+    window.localStorage = {
+      data: Object.create(null),
+      getItem: function (key) {
+        return this.data[key];
+      },
+      setItem: function (key, value) {
+        this.data[key] = value;
+      }
+    };
+  } catch (e) {
+    console.log('Unable to create polyfill for localStorage');
+  }
 })();