diff --git a/aws-sdk/aws-sdk.d.ts b/aws-sdk/aws-sdk.d.ts
index cb35f34e97..401babd4e0 100644
--- a/aws-sdk/aws-sdk.d.ts
+++ b/aws-sdk/aws-sdk.d.ts
@@ -118,6 +118,37 @@ declare module "aws-sdk" {
     region: string;
   }
 
+  export class CloudFormation {
+      constructor(options?: CloudFormation.Options);
+      endpoint: Endpoint;
+
+      cancelUpdateStack(params: CloudFormation.CancelUpdateStackParams, callback: (err: AwsError, data: any) => void): void;
+      continueUpdateRollback(params: CloudFormation.ContinueUpdateRollbackParams, callback: (err: AwsError, data: any) => void): void;
+      createChangeSet(params: CloudFormation.CreateChangeSetParams, callback: (err: AwsError, data: any) => void): void;
+      createStack(params: CloudFormation.CreateStackParams, callback: (err: AwsError, data: any) => void): void;
+      deleteChangeSet(params: CloudFormation.DeleteChangeSetParams, callback: (err: AwsError, data: any) => void): void;
+      deleteStack(params: CloudFormation.DeleteStackParams, callback: (err: AwsError, data: any) => void): void;
+      describeAccountLimits(params: CloudFormation.DescribeAccountLimitsParams, callback: (err: AwsError, data: any) => void): void;
+      describeChangeSet(params: CloudFormation.DescribeChangeSetParams, callback: (err: AwsError, data: any) => void): void;
+      describeStackEvents(params: CloudFormation.DescribeStackEventsParams, callback: (err: AwsError, data: any) => void): void;
+      describeStackResource(params: CloudFormation.DescribeStackResourceParams, callback: (err: AwsError, data: any) => void): void;
+      describeStackResources(params: CloudFormation.DescribeStackResourcesParams, callback: (err: AwsError, data: any) => void): void;
+      describeStacks(params: CloudFormation.DescribeStacksParams, callback: (err: AwsError, data: any) => void): void;
+      estimateTemplateCost(params: CloudFormation.EstimateTemplateCostParams, callback: (err: AwsError, data: any) => void): void;
+      executeChangeSet(params: CloudFormation.ExecuteChangeSetParams, callback: (err: AwsError, data: any) => void): void;
+      getStackPolicy(params: CloudFormation.GetStackPolicyParams, callback: (err: AwsError, data: any) => void): void;
+      getTemplate(params: CloudFormation.GetTemplateParams, callback: (err: AwsError, data: any) => void): void;
+      getTemplateSummary(params: CloudFormation.GetTemplateSummaryParams, callback: (err: AwsError, data: any) => void): void;
+      listChangeSets(params: CloudFormation.ListChangeSetsParams, callback: (err: AwsError, data: any) => void): void;
+      listStackResources(params: CloudFormation.ListStackResourcesParams, callback: (err: AwsError, data: any) => void): void;
+      listStacks(params: CloudFormation.ListStacksParams, callback: (err: AwsError, data: any) => void): void;
+      setStackPolicy(params: CloudFormation.SetStackPolicyParams, callback: (err: AwsError, data: any) => void): void;
+      signalResource(params: CloudFormation.SignalResourceParams, callback: (err: AwsError, data: any) => void): void;
+      updateStack(params: CloudFormation.UpdateStackParams, callback: (err: AwsError, data: any) => void): void;
+      validateTemplate(params: CloudFormation.ValidateTemplateParams, callback: (err: AwsError, data: any) => void): void;
+      waitFor(state: string, params: CloudFormation.WaitForParams, callback: (err: AwsError, data: any) => void): void;
+  }
+
   export class Lambda {
     constructor(options?: any);
     endpoint: Endpoint;
@@ -423,6 +454,214 @@ declare module "aws-sdk" {
 
   // ===========================================================
 
+  export module CloudFormation {
+
+    export interface CancelUpdateStackParams {
+      StackName: string;
+    }
+
+    export interface ContinueUpdateRollbackParams {
+      StackName: string;
+    }
+
+    export interface CreateChangeSetParams {
+      StackName: string;
+      TemplateBody?: string;  //  specify either TemplateBody or TemplateURL
+      TemplateURL?: string;   //  specify either TemplateBody or TemplateURL
+      UsePreviousTemplate?: boolean;
+      Parameters?: CloudFormation.Parameter[];
+      Capabilities?: string[];  //  CAPABILITY_IAM | CAPABILITY_NAMED_IAM
+      ResourceTypes?: string[];
+      NotificationARNs?: string[];
+      Tags?: CloudFormation.Tag[];
+      ChangeSetName: string;
+      ClientToken?: string;
+      Description?: string;
+    }
+
+    export interface CreateStackParams {
+      StackName: string;
+      TemplateBody?: string;  //  specify either TemplateBody or TemplateURL
+      TemplateURL?: string;   //  specify either TemplateBody or TemplateURL
+      Parameters?: CloudFormation.Parameter[];
+      DisableRollback?: boolean;  //  cannot specify both DisableRollback and OnFailure
+      TimeoutInMinutes?: number;
+      NotificationARNs?: string[];
+      Capabilities?: string[];
+      ResourceTypes?: string[];
+      OnFailure?: string[];       //  cannot specify both DisableRollback and OnFailure
+                                  //  DO_NOTHING | ROLLBACK | DELETE
+      StackPolicyBody?: string[];  //  cannot specify both StackPolicyBody and StackPolicyURL
+      StackPolicyURL?: string[];   //  cannot specify both StackPolicyBody and StackPolicyURL
+      Tags?: CloudFormation.Tag[];
+    }
+
+    export interface DeleteChangeSetParams {
+      ChangeSetName: string;
+      StackName?: string;
+    }
+
+    export interface DeleteStackParams {
+      StackName: string;
+      RetainResources?: string[];
+    }
+
+    export interface DescribeAccountLimitsParams {
+      NextToken?: string;
+    }
+
+    export interface DescribeChangeSetParams {
+      ChangeSetName: string;
+      StackName?: string;
+      NextToken?: string;
+    }
+
+    export interface DescribeStackEventsParams {
+      StackName?: string;
+      NextToken?: string;
+    }
+
+    export interface DescribeStackResourceParams {
+      StackName: string;
+      LogicalResourceId: string;
+    }
+
+    export interface DescribeStackResourcesParams {
+      StackName?: string;          //  must specify either StackName or PhysicalResourceId
+      LogicalResourceId?: string; 
+      PhysicalResourceId?: string; //  must specify either StackName or PhysicalResourceId
+    }
+
+    export interface DescribeStacksParams {
+      StackName?: string;
+      NextToken?: string;
+    }
+
+    export interface EstimateTemplateCostParams {
+      TemplateBody?: string;  //  must specify either TemplateBody or TemplateURL
+                              //  if both are passed, only TemplateBody is used
+      TemplateURL?: string;   //  must specify either TemplateBody or TemplateURL
+      Parameters?: CloudFormation.Parameter[];
+    }
+
+    export interface ExecuteChangeSetParams {
+      ChangeSetName: string;
+      StackName?: string;
+    }
+
+    export interface GetStackPolicyParams {
+      StackName: string;
+    }
+
+    export interface GetTemplateParams {
+      StackName: string;
+    }
+
+    export interface GetTemplateSummaryParams {
+      //  must specify one of the three
+      TemplateBody?: string;
+      TemplateURL?: string;
+      StackName?: string;
+    }
+
+    export interface ListChangeSetsParams {
+      StackName: string;
+      NextToken?: string;
+    }
+
+    export interface ListStackResourcesParams {
+      StackName: string;
+      NextToken?: string;
+    }
+
+    export interface ListStacksParams {
+      NextToken?: string;
+      StackStatusFilter?: string[];
+    }
+
+    export interface SetStackPolicyParams {
+      StackName: string;
+      StackPolicyBody?: string;  //  cannot set both StackPolicyBody and StackPolicyURL
+      StackPolicyURL?: string;   //  cannot set both StackPolicyBody and StackPolicyURL
+    }
+
+    export interface SignalResourceParams {
+      StackName: string;
+      LogicalResourceId: string;
+      UniqueId: string;
+      Status: string;  //  SUCCESS | FAILURE
+    }
+
+    export interface UpdateStackParams {
+      StackName: string;
+      TemplateBody?: string;  //  specify either TemplateBody or TemplateURL, not both
+      TemplateURL?: string;   //  specify either TemplateBody or TemplateURL, not both
+      UsePreviousTemplate?: boolean;
+      StackPolicyDuringUpdateBody?: string;  //  cannot set both StackPolicyDuringUpdateBody and StackPolicyDuringUpdateURL
+      StackPolicyDuringUpdateURL?: string;   //  cannot set both StackPolicyDuringUpdateBody and StackPolicyDuringUpdateURL
+      Parameters?: CloudFormation.Parameter[];
+      Capabilities?: string[];  //  CAPABILITY_IAM | CAPABILITY_NAMED_IAM
+      ResourceTypes?: string[];
+      StackPolicyBody?: string;  //  cannot set both StackPolicyBody and StackPolicyURL
+      StackPolicyURL?: string;   //  cannot set both StackPolicyBody and StackPolicyURL
+      NotificationARNs?: string[];
+      Tags?: CloudFormation.Tag[];
+    }
+
+    export interface ValidateTemplateParams {
+      TemplateBody?: string;  //  must pass either TemplateBody or TemplateURL
+                              //  if both are specified, only TemplateBody is used
+      TemplateURL?: string;   //  must pass either TemplateBody or TemplateURL
+    }
+
+    export interface WaitForParams {
+      StackName: string;
+      NextToken?: string;
+    }
+
+    export interface Options {
+      params?: any;
+      endpoint?: string;
+      accessKeyId?: string;
+      secretAccessKey?: string;
+      sessionToken?: any;
+      credentials?: any;
+      credentialProvider?: any;
+      region?: string;
+      maxRetries?: number;
+      maxRedirects?: number;
+      sslEnabled?: boolean;
+      paramValidation?: any;
+      computeChecksums?: boolean;
+      convertResponseTypes?: boolean;
+      correctClockSkew?: boolean;
+      s3ForcePathStyle?: boolean;
+      s3BucketEndpoint?: boolean;
+      s3DisableBodySigning?: boolean;
+      retryDelayOptions?: any;
+      httpOptions?: any;
+      apiVersion?: any;
+      apiVersions?: any;
+      logger?: any;
+      systemClockOffset?: number;
+      signatureVersion?: string;
+      signatureCache?: boolean;
+    }
+
+    export interface Parameter {
+      ParameterKey: string;
+      ParameterValue: string;
+      UsePreviousValue?: boolean;  //  if you specify true, do not specify ParameterValue
+    }
+
+    export interface Tag {
+      Key: string;
+      Value: string;
+    }
+  }
+
+  // ===========================================================
+
   export module Lambda {
 
     export interface AddPermissionParams {