diff --git a/aws-sdk-core/apis/workspaces/2015-04-08/api-2.json b/aws-sdk-core/apis/workspaces/2015-04-08/api-2.json
index 97ef386aa59..483c04433f7 100644
--- a/aws-sdk-core/apis/workspaces/2015-04-08/api-2.json
+++ b/aws-sdk-core/apis/workspaces/2015-04-08/api-2.json
@@ -138,6 +138,7 @@
         "Name":{"shape":"Compute"}
       }
     },
+    "ComputerName":{"type":"string"},
     "CreateWorkspacesRequest":{
       "type":"structure",
       "required":["Workspaces"],
@@ -407,6 +408,7 @@
         "Capacity":{"shape":"NonEmptyString"}
       }
     },
+    "VolumeEncryptionKey":{"type":"string"},
     "Workspace":{
       "type":"structure",
       "members":{
@@ -418,7 +420,11 @@
         "BundleId":{"shape":"BundleId"},
         "SubnetId":{"shape":"SubnetId"},
         "ErrorMessage":{"shape":"Description"},
-        "ErrorCode":{"shape":"WorkspaceErrorCode"}
+        "ErrorCode":{"shape":"WorkspaceErrorCode"},
+        "ComputerName":{"shape":"ComputerName"},
+        "VolumeEncryptionKey":{"shape":"VolumeEncryptionKey"},
+        "UserVolumeEncryptionEnabled":{"shape":"BooleanObject"},
+        "RootVolumeEncryptionEnabled":{"shape":"BooleanObject"}
       }
     },
     "WorkspaceBundle":{
@@ -491,7 +497,10 @@
       "members":{
         "DirectoryId":{"shape":"DirectoryId"},
         "UserName":{"shape":"UserName"},
-        "BundleId":{"shape":"BundleId"}
+        "BundleId":{"shape":"BundleId"},
+        "VolumeEncryptionKey":{"shape":"VolumeEncryptionKey"},
+        "UserVolumeEncryptionEnabled":{"shape":"BooleanObject"},
+        "RootVolumeEncryptionEnabled":{"shape":"BooleanObject"}
       }
     },
     "WorkspaceRequestList":{
diff --git a/aws-sdk-core/apis/workspaces/2015-04-08/docs-2.json b/aws-sdk-core/apis/workspaces/2015-04-08/docs-2.json
index 1bf19c99b37..ffdf4c2a581 100644
--- a/aws-sdk-core/apis/workspaces/2015-04-08/docs-2.json
+++ b/aws-sdk-core/apis/workspaces/2015-04-08/docs-2.json
@@ -28,7 +28,11 @@
       "refs": {
         "DefaultWorkspaceCreationProperties$EnableWorkDocs": "<p>Specifies if the directory is enabled for Amazon WorkDocs.</p>",
         "DefaultWorkspaceCreationProperties$EnableInternetAccess": "<p>A public IP address will be attached to all WorkSpaces that are created or rebuilt.</p>",
-        "DefaultWorkspaceCreationProperties$UserEnabledAsLocalAdministrator": "<p>The WorkSpace user is an administrator on the WorkSpace.</p>"
+        "DefaultWorkspaceCreationProperties$UserEnabledAsLocalAdministrator": "<p>The WorkSpace user is an administrator on the WorkSpace.</p>",
+        "Workspace$UserVolumeEncryptionEnabled": "<p>Specifies whether the data stored on the user volume, or D: drive, is encrypted.</p>",
+        "Workspace$RootVolumeEncryptionEnabled": "<p>Specifies whether the data stored on the root volume, or C: drive, is encrypted.</p>",
+        "WorkspaceRequest$UserVolumeEncryptionEnabled": "<p>Specifies whether the data stored on the user volume, or D: drive, is encrypted.</p>",
+        "WorkspaceRequest$RootVolumeEncryptionEnabled": "<p>Specifies whether the data stored on the root volume, or C: drive, is encrypted.</p>"
       }
     },
     "BundleId": {
@@ -72,6 +76,12 @@
         "WorkspaceBundle$ComputeType": "<p>A <a>ComputeType</a> object that specifies the compute type for the bundle.</p>"
       }
     },
+    "ComputerName": {
+      "base": null,
+      "refs": {
+        "Workspace$ComputerName": "<p>The name of the WorkSpace as seen by the operating system.</p>"
+      }
+    },
     "CreateWorkspacesRequest": {
       "base": "<p>Contains the inputs for the <a>CreateWorkspaces</a> operation.</p>",
       "refs": {
@@ -374,6 +384,13 @@
         "WorkspaceBundle$UserStorage": "<p>A <a>UserStorage</a> object that specifies the amount of user storage that the bundle contains.</p>"
       }
     },
+    "VolumeEncryptionKey": {
+      "base": null,
+      "refs": {
+        "Workspace$VolumeEncryptionKey": "<p>The KMS key used to encrypt data stored on your WorkSpace.</p>",
+        "WorkspaceRequest$VolumeEncryptionKey": "<p>The KMS key used to encrypt data stored on your WorkSpace.</p>"
+      }
+    },
     "Workspace": {
       "base": "<p>Contains information about a WorkSpace.</p>",
       "refs": {