diff --git a/build/build-manifest.php b/build/build-manifest.php
index ace26e6a5c..ac33c3cfa1 100644
--- a/build/build-manifest.php
+++ b/build/build-manifest.php
@@ -84,6 +84,14 @@
 
     $manifest[$identifier]['versions'][$metadata['apiVersion']]
         = $metadata['apiVersion'];
+
+    $serviceIdentifier = isset($metadata['serviceId'])
+        ? str_replace(' ', '_', strtolower($metadata['serviceId']))
+        : '';
+
+    if (!empty($serviceIdentifier)) {
+        $manifest[$identifier]['serviceIdentifier'] = $serviceIdentifier;
+    }
 }
 
 foreach ($manifest as $identifier => &$metadata) {
diff --git a/src/data/cloudsearchdomain/2013-01-01/api-2.json b/src/data/cloudsearchdomain/2013-01-01/api-2.json
index e22e35ec24..c26c34e5d4 100644
--- a/src/data/cloudsearchdomain/2013-01-01/api-2.json
+++ b/src/data/cloudsearchdomain/2013-01-01/api-2.json
@@ -6,6 +6,7 @@
     "jsonVersion":"1.1",
     "protocol":"rest-json",
     "serviceFullName":"Amazon CloudSearch Domain",
+    "serviceId":"CloudSearch Domain",
     "signatureVersion":"v4",
     "signingName":"cloudsearch",
     "uid":"cloudsearchdomain-2013-01-01"
diff --git a/src/data/entitlement.marketplace/2017-01-11/api-2.json b/src/data/entitlement.marketplace/2017-01-11/api-2.json
index bf13c17535..967a2c789d 100644
--- a/src/data/entitlement.marketplace/2017-01-11/api-2.json
+++ b/src/data/entitlement.marketplace/2017-01-11/api-2.json
@@ -6,6 +6,7 @@
     "jsonVersion":"1.1",
     "protocol":"json",
     "serviceFullName":"AWS Marketplace Entitlement Service",
+    "serviceId":"Marketplace Entitlement Service",
     "signatureVersion":"v4",
     "signingName":"aws-marketplace",
     "targetPrefix":"AWSMPEntitlementService",
diff --git a/src/data/importexport/2010-06-01/api-2.json b/src/data/importexport/2010-06-01/api-2.json
index 0c2a8ddf4c..62aef381bd 100644
--- a/src/data/importexport/2010-06-01/api-2.json
+++ b/src/data/importexport/2010-06-01/api-2.json
@@ -6,6 +6,7 @@
     "endpointPrefix":"importexport",
     "globalEndpoint":"importexport.amazonaws.com",
     "serviceFullName":"AWS Import/Export",
+    "serviceId":"ImportExport",
     "signatureVersion":"v2",
     "xmlNamespace":"http://importexport.amazonaws.com/doc/2010-06-01/",
     "protocol":"query"
diff --git a/src/data/mobile/2017-07-01/api-2.json b/src/data/mobile/2017-07-01/api-2.json
index 6ef48111b3..9d63e8d2dc 100644
--- a/src/data/mobile/2017-07-01/api-2.json
+++ b/src/data/mobile/2017-07-01/api-2.json
@@ -6,6 +6,7 @@
     "jsonVersion":"1.1",
     "protocol":"rest-json",
     "serviceFullName":"AWS Mobile",
+    "serviceId":"Mobile",
     "signatureVersion":"v4",
     "signingName":"AWSMobileHubService",
     "uid":"mobile-2017-07-01"