diff --git a/ant/1.1/properties/sfdc.metadata.properties b/ant/1.1/properties/sfdc.metadata.properties
index 42e86d6..7ea7192 100644
--- a/ant/1.1/properties/sfdc.metadata.properties
+++ b/ant/1.1/properties/sfdc.metadata.properties
@@ -31,7 +31,7 @@
 # properties defined below...
 #
 sf.dirs.folderBased    = dashboards documents email reports
-sf.dirs.nonFolderBased = assignmentRules escalationRules applications classes components datacategorygroups entitlementTemplates entitlementProcesses milestoneTypes homePageComponents homePageLayouts labels layouts letterhead objects objectTranslations pages portals profiles remoteSiteSettings reportTypes scontrols sites staticresources tabs triggers weblinks workflows permissionsets flows flowDefinitions callCenters globalPicklists globalValueSets globalValueSetTranslations standardValueSets
+sf.dirs.nonFolderBased = assignmentRules escalationRules applications classes components datacategorygroups entitlementTemplates entitlementProcesses milestoneTypes homePageComponents homePageLayouts labels layouts letterhead objects objectTranslations pages portals profiles remoteSiteSettings reportTypes scontrols sites staticresources tabs triggers weblinks workflows permissionsets flows flowDefinitions callCenters globalPicklists globalValueSets globalValueSetTranslations standardValueSets customMetadata
 
 #
 # All the supported directories - each directory has a corresponding metadata name.
@@ -164,6 +164,7 @@ sf.metadata.escalationRules              = EscalationRules
 sf.metadata.applications                 = CustomApplication
 sf.metadata.classes                      = ApexClass
 sf.metadata.components                   = ApexComponent
+sf.metadata.customMetadata               = CustomMetadata
 sf.metadata.dashboards                   = Dashboard
 sf.metadata.datacategorygroups           = DataCategoryGroup
 sf.metadata.documents                    = Document
@@ -245,6 +246,7 @@ sf.dir.GlobalPicklists              = globalPicklists
 sf.dir.GlobalValueSets              = globalValueSet
 sf.dir.GlobalValueSetTranslations   = globalValueSetTranslation
 sf.dir.StandardValueSets            = standardValueSet
+sf.dir.CustomMetadata               = customMetadata
 
 #
 # Fixed members for objects.
diff --git a/ant/1.1/templates/deployment.xml.template b/ant/1.1/templates/deployment.xml.template
index 5b3bc55..43862c2 100644
--- a/ant/1.1/templates/deployment.xml.template
+++ b/ant/1.1/templates/deployment.xml.template
@@ -24,6 +24,10 @@
         <members>*</members>
         <name>CustomLabel</name>
     </types>
+    <types>
+        <members>*</members>
+        <name>CustomMetadata</name>
+    </types>
     <types>
         <members>*</members>
         <members>Account</members>
diff --git a/ant/1.1/util/sfdc-util.xml b/ant/1.1/util/sfdc-util.xml
index 3418297..28b7238 100644
--- a/ant/1.1/util/sfdc-util.xml
+++ b/ant/1.1/util/sfdc-util.xml
@@ -288,6 +288,7 @@ ${sfdc-util.SF-JAR.PATH}
             xmlMap.put("standardValueSets", "StandardValueSet");
 			xmlMap.put("entitlementProcesses", "EntitlementProcess");
 			xmlMap.put("milestoneTypes", "MilestoneType");
+			xmlMap.put("customMetadata", "CustomMetadata");
 
             Map suffixMap = new TreeMap();     // Dir name to suffix...
             suffixMap.put("installedPackages", "installedPackage");
diff --git a/scripts/solenopsis b/scripts/solenopsis
index 9d24990..d176a28 100755
--- a/scripts/solenopsis
+++ b/scripts/solenopsis
@@ -71,7 +71,8 @@ METADATA_TYPES = [ 'CustomApplication', 'ApexClass', 'ApexComponent', 'Dashboard
                     'Layout', 'Letterhead', 'CustomObject', 'CustomObjectTranslation', 'ApexPage', 'PermissionSet',
                     'Portal', 'Profile', 'RemoteSiteSetting', 'Report', 'ReportType', 'Scontrol', 'CustomSite',
                     'StaticResource', 'CustomTab', 'ApexTrigger', 'CustomPageWebLink', 'Workflow', 'GlobalPicklist',
-                    'GlobalValueSet', 'GlobalValueSetTranslation', 'StandardValueSet', 'StandardValueSetTranslation' ]
+                    'GlobalValueSet', 'GlobalValueSetTranslation', 'StandardValueSet', 'StandardValueSetTranslation',
+                    'CustomMetadata' ]
 SOL_VERSIONS = [ '1.1', '1.2' ]
 API_VERSIONS = [ '16.0', '17.0', '18.0', '19.0', '20.0', '21.0', '22.0', '23.0', '24.0', '25.0', '26.0', '27.0', '28.0', '29.0', '30.0', '31.0', '32.0', '33.0', '34.0', '35.0', '36.0', '37.0', '38.0', '39.0' ]