diff --git a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java b/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
index 1268ef7..6a5faf5 100644
--- a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
+++ b/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
@@ -105,6 +105,12 @@ public class ExtractorFactory {
                 if(corePart.getContentType().equals(XSSFRelation.MACRO_WORKBOOK.getContentType())) {
                         return new XSSFExcelExtractor(pkg);
                 }
+                if(corePart.getContentType().equals(XSSFRelation.MACRO_ADDIN_WORKBOOK.getContentType())) {
+                        return new XSSFExcelExtractor(pkg);
+                }
+                if(corePart.getContentType().equals(XSSFRelation.MACRO_TEMPLATE_WORKBOOK.getContentType())) {
+                        return new XSSFExcelExtractor(pkg);
+                }
 		if(corePart.getContentType().equals(XWPFRelation.DOCUMENT.getContentType())) {
 			return new XWPFWordExtractor(pkg);
 		}
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
index 57a7680..38de8bd 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
@@ -72,12 +72,24 @@ public final class XSSFRelation extends POIXMLRelation {
                   "/xl/workbook.xml",
                   null
         );
+        public static final XSSFRelation MACRO_TEMPLATE_WORKBOOK = new XSSFRelation(
+                  "application/vnd.ms-excel.template.macroEnabled.main+xml",
+                  "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument",
+                  "/xl/workbook.xml",
+                  null
+        );
         public static final XSSFRelation MACRO_WORKBOOK = new XSSFRelation(
                   "application/vnd.ms-excel.sheet.macroEnabled.main+xml",
                   "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument",
                   "/xl/workbook.xml",
                   null
         );
+        public static final XSSFRelation MACRO_ADDIN_WORKBOOK = new XSSFRelation(
+                  "application/vnd.ms-excel.addin.macroEnabled.main+xml",
+                  "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument",
+                  "/xl/workbook.xml",
+                  null
+        );
 	public static final XSSFRelation WORKSHEET = new XSSFRelation(
 			"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml",
 			"http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet",