diff --git a/config/alfresco/mimetype/openoffice-document-formats.xml b/config/alfresco/mimetype/openoffice-document-formats.xml
index 4c6b810ba1..fa2494df45 100644
--- a/config/alfresco/mimetype/openoffice-document-formats.xml
+++ b/config/alfresco/mimetype/openoffice-document-formats.xml
@@ -405,6 +405,15 @@
     </export-filters>
   </document-format>
   
+  <document-format><name>Microsoft Visio 2013</name>
+    <family>Presentation</family>
+    <mime-type>application/vnd.visio2013</mime-type>
+    <file-extension>vsdx</file-extension>
+    <export-filters>
+      <entry><family>Presentation</family><string>MS Visio</string></entry>
+    </export-filters>
+  </document-format>
+  
   <document-format><name>OpenDocument Drawing</name>
     <family>Presentation</family>
     <mime-type>application/vnd.oasis.opendocument.graphics</mime-type>
diff --git a/config/alfresco/subsystems/Transformers/default/transformers.properties b/config/alfresco/subsystems/Transformers/default/transformers.properties
index af53b14e54..de63b4ac30 100644
--- a/config/alfresco/subsystems/Transformers/default/transformers.properties
+++ b/config/alfresco/subsystems/Transformers/default/transformers.properties
@@ -195,6 +195,7 @@ content.transformer.JodConverter.extensions.ppam.pdf.maxSourceSizeKBytes=4096
 content.transformer.JodConverter.extensions.dotm.pdf.maxSourceSizeKBytes=768
 content.transformer.JodConverter.extensions.doc.pdf.maxSourceSizeKBytes=10240
 content.transformer.JodConverter.extensions.vsd.pdf.maxSourceSizeKBytes=4096
+content.transformer.JodConverter.extensions.vsdx.pdf.maxSourceSizeKBytes=4096
 content.transformer.JodConverter.extensions.ppsx.pdf.maxSourceSizeKBytes=4096
 
 content.transformer.JodConverter.Html2Pdf.edition=Enterprise
@@ -290,6 +291,7 @@ content.transformer.OpenOffice.extensions.ppam.pdf.maxSourceSizeKBytes=4096
 content.transformer.OpenOffice.extensions.dotm.pdf.maxSourceSizeKBytes=768
 content.transformer.OpenOffice.extensions.doc.pdf.maxSourceSizeKBytes=10240
 content.transformer.OpenOffice.extensions.vsd.pdf.maxSourceSizeKBytes=4096
+content.transformer.OpenOffice.extensions.vsdx.pdf.maxSourceSizeKBytes=4096
 content.transformer.OpenOffice.extensions.ppsx.pdf.maxSourceSizeKBytes=4096
 
 content.transformer.OpenOffice.Html2Pdf.pipeline=OpenOffice|odt|OpenOffice
diff --git a/source/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracter.java
index d08d9fe3d2..d645deb768 100644
--- a/source/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracter.java
@@ -73,7 +73,8 @@ public class OfficeMetadataExtracter extends TikaPoweredMetadataExtracter
               MimetypeMap.MIMETYPE_WORD,
               MimetypeMap.MIMETYPE_EXCEL,
               MimetypeMap.MIMETYPE_PPT,
-              MimetypeMap.MIMETYPE_VISIO },
+              MimetypeMap.MIMETYPE_VISIO,
+              MimetypeMap.MIMETYPE_VISIO_2013 },
           new OfficeParser()
     );
     static {