diff --git a/bower.json b/bower.json
index 9eea5d0b7..9534e650d 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.1.350",
+  "version": "1.1.352",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index da7ed464a..05e2e7eee 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.1.350';
-PDFJS.build = '72ecbec';
+PDFJS.version = '1.1.352';
+PDFJS.build = '977397e';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -24814,7 +24814,7 @@ var Font = (function FontClosure() {
       var isTrueType = !tables['CFF '];
       if (!isTrueType) {
         // OpenType font
-        if (header.version === 'OTTO' ||
+        if ((header.version === 'OTTO' && properties.type !== 'CIDFontType2') ||
             !tables.head || !tables.hhea || !tables.maxp || !tables.post) {
           // no major tables: throwing everything at CFFFont
           cffFile = new Stream(tables['CFF '].data);
diff --git a/build/pdf.js b/build/pdf.js
index 1bba2efad..433aafab9 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.1.350';
-PDFJS.build = '72ecbec';
+PDFJS.version = '1.1.352';
+PDFJS.build = '977397e';
 
 (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 023ef53f5..87b2444cf 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.1.350';
-PDFJS.build = '72ecbec';
+PDFJS.version = '1.1.352';
+PDFJS.build = '977397e';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -18413,7 +18413,7 @@ var Font = (function FontClosure() {
       var isTrueType = !tables['CFF '];
       if (!isTrueType) {
         // OpenType font
-        if (header.version === 'OTTO' ||
+        if ((header.version === 'OTTO' && properties.type !== 'CIDFontType2') ||
             !tables.head || !tables.hhea || !tables.maxp || !tables.post) {
           // no major tables: throwing everything at CFFFont
           cffFile = new Stream(tables['CFF '].data);
diff --git a/package.json b/package.json
index 464fcc02d..c76e1a8b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.1.350",
+  "version": "1.1.352",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",