diff --git a/src/sampleconf/mimemap b/src/sampleconf/mimemap
index 0991a540..6d4f0bc4 100644
--- a/src/sampleconf/mimemap
+++ b/src/sampleconf/mimemap
@@ -136,17 +136,24 @@
 .fodt = application/vnd.oasis.opendocument.text-flat-xml
 .fods = application/vnd.oasis.opendocument.spreadsheet-flat-xml
 
-# ms openxml 
-.docm = application/vnd.ms-word.document.macroEnabled.12
+# ms openxml
+# .docm = application/vnd.ms-word.document.macroEnabled.12
+.docm = application/vnd.openxmlformats-officedocument.wordprocessingml.document
 .docx = application/vnd.openxmlformats-officedocument.wordprocessingml.document
-.dotm = application/vnd.ms-word.template.macroEnabled.12
+# .dotm = application/vnd.ms-word.template.macroEnabled.12
+.dotm = application/vnd.openxmlformats-officedocument.wordprocessingml.template 
 .dotx = application/vnd.openxmlformats-officedocument.wordprocessingml.template
-.potm = application/vnd.ms-powerpoint.template.macroEnabled.12
+# .potm = application/vnd.ms-powerpoint.template.macroEnabled.12
+.potm = application/vnd.openxmlformats-officedocument.presentationml.template
 .potx = application/vnd.openxmlformats-officedocument.presentationml.template
-.ppam = application/vnd.ms-powerpoint.addin.macroEnabled.12
-.ppsm = application/vnd.ms-powerpoint.slideshow.macroEnabled.12
-.ppsx = application/vnd.openxmlformats-officedocument.presentationml.slideshow
-.pptm = application/vnd.ms-powerpoint.presentation.macroEnabled.12
+# .ppam = application/vnd.ms-powerpoint.addin.macroEnabled.12
+.ppam = application/vnd.openxmlformats-officedocument.presentationml.presentation
+# .ppsm = application/vnd.ms-powerpoint.slideshow.macroEnabled.12
+.ppsm = application/vnd.openxmlformats-officedocument.presentationml.presentation
+# .ppsx = application/vnd.openxmlformats-officedocument.presentationml.slideshow
+.ppsx = application/vnd.openxmlformats-officedocument.presentationml.presentation
+# .pptm = application/vnd.ms-powerpoint.presentation.macroEnabled.12
+.pptm = application/vnd.openxmlformats-officedocument.presentationml.presentation
 .pptx = application/vnd.openxmlformats-officedocument.presentationml.presentation
 .vsdx = application/vnd.ms-visio.drawing
 .xlam = application/vnd.ms-excel.addin.macroEnabled.12