diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js
index 254f47d1..639668d8 100644
--- a/js/viewer/viewer.js
+++ b/js/viewer/viewer.js
@@ -14,6 +14,27 @@ var odfViewer = {
 		'application/pdf',
 		'application/vnd.visio',
 		'application/vnd.wordperfect',
+		'application/msonenote',
+		'application/msword',
+		'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+		'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+		'application/vnd.ms-word.document.macroEnabled.12',
+		'application/vnd.ms-word.template.macroEnabled.12',
+		'application/vnd.ms-excel',
+		'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+		'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+		'application/vnd.ms-excel.sheet.macroEnabled.12',
+		'application/vnd.ms-excel.template.macroEnabled.12',
+		'application/vnd.ms-excel.addin.macroEnabled.12',
+		'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+		'application/vnd.ms-powerpoint',
+		'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+		'application/vnd.openxmlformats-officedocument.presentationml.template',
+		'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+		'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+		'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+		'application/vnd.ms-powerpoint.template.macroEnabled.12',
+		'application/vnd.ms-powerpoint.slideshow.macroEnabled.12'
 	],
 
 	register : function(response){
diff --git a/lib/storage.php b/lib/storage.php
index d5d8b1a6..5d756091 100644
--- a/lib/storage.php
+++ b/lib/storage.php
@@ -30,16 +30,32 @@ class Storage {
 		'application/vnd.oasis.opendocument.presentation',
 		'application/vnd.oasis.opendocument.spreadsheet',
 		'application/vnd.oasis.opendocument.graphics',
-		'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
 		'application/vnd.lotus-wordpro',
 		'image/svg+xml',
-		'application/vnd.ms-powerpoint',
-		'application/vnd.ms-excel',
-		'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
 		'application/pdf',
 		'application/vnd.visio',
 		'application/vnd.wordperfect',
-		'application/vnd.oasis.opendocument.graphics'
+		'application/msonenote',
+		'application/msword',
+		'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+		'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+		'application/vnd.ms-word.document.macroEnabled.12',
+		'application/vnd.ms-word.template.macroEnabled.12',
+		'application/vnd.ms-excel',
+		'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+		'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+		'application/vnd.ms-excel.sheet.macroEnabled.12',
+		'application/vnd.ms-excel.template.macroEnabled.12',
+		'application/vnd.ms-excel.addin.macroEnabled.12',
+		'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+		'application/vnd.ms-powerpoint',
+		'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+		'application/vnd.openxmlformats-officedocument.presentationml.template',
+		'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+		'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+		'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+		'application/vnd.ms-powerpoint.template.macroEnabled.12',
+		'application/vnd.ms-powerpoint.slideshow.macroEnabled.12'
 	);
 
 	public static function getDocuments() {