diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+# Amazon Key Management Service SDK
+
+> _Warning:_ This is an experimental preview release which is still under heavy development and not intended for public consumption, _caveat emptor_!
+
+* [description](#description)
+* [Contribute](#contribute)
+* [Licence](#licence)
+
+## Description
+
+Amazon Key Management Service (KMS) is a managed service that makes it easy for you to create and control the encryption keys used to encrypt your data, and uses Hardware Security Modules (HSMs) to protect the security of your keys. Amazon Key Management Service is integrated with other Amazon services including Amazon EBS, Amazon S3, and Amazon Redshift. Amazon Key Management Service is also integrated with Amazon CloudTrail to provide you with logs of all key usage to help meet your regulatory and compliance needs. 
+
+Documentation is available via [Hackage](http://hackage.haskell.org/package/amazonka-kms)
+and [AWS API Reference](http://docs.aws.amazon.com/kms/latest/APIReference/Welcome.html).
+
+
+## Contribute
+
+For any problems, comments, or feedback please create an issue [here on GitHub](https://github.com/brendanhay/amazonka/issues).
+
+> _Note:_ this library is an auto-generated Haskell package. Please see `amazonka-gen` for more information.
+
+
+## Licence
+
+`amazonka-kms` is released under the [Mozilla Public License Version 2.0](http://www.mozilla.org/MPL/).
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/amazonka-kms.cabal b/amazonka-kms.cabal
new file mode 100644
--- /dev/null
+++ b/amazonka-kms.cabal
@@ -0,0 +1,73 @@
+name:                  amazonka-kms
+version:               0.0.0
+synopsis:              Amazon Key Management Service SDK.
+homepage:              https://github.com/brendanhay/amazonka
+license:               OtherLicense
+license-file:          LICENSE
+author:                Brendan Hay
+maintainer:            Brendan Hay <brendan.g.hay@gmail.com>
+copyright:             Copyright (c) 2013-2014 Brendan Hay
+category:              Network, AWS, Cloud
+build-type:            Simple
+extra-source-files:    README.md
+cabal-version:         >= 1.10
+
+description:
+    Amazon Key Management Service (KMS) is a managed service that makes it
+    easy for you to create and control the encryption keys used to encrypt
+    your data, and uses Hardware Security Modules (HSMs) to protect the
+    security of your keys. Amazon Key Management Service is integrated with
+    other Amazon services including Amazon EBS, Amazon S3, and Amazon
+    Redshift. Amazon Key Management Service is also integrated with Amazon
+    CloudTrail to provide you with logs of all key usage to help meet your
+    regulatory and compliance needs.
+    .
+    /See:/ <http://docs.aws.amazon.com/kms/latest/APIReference/Welcome.html AWS API Reference>
+    .
+    /Warning:/ This is an experimental preview release which is still under
+    heavy development and not intended for public consumption, caveat emptor!
+
+source-repository head
+    type:     git
+    location: git://github.com/brendanhay/amazonka.git
+
+library
+    default-language:  Haskell2010
+    hs-source-dirs:    src gen
+
+    ghc-options:       -Wall
+
+    exposed-modules:
+          Network.AWS.KMS
+        , Network.AWS.KMS.CreateAlias
+        , Network.AWS.KMS.CreateGrant
+        , Network.AWS.KMS.CreateKey
+        , Network.AWS.KMS.Decrypt
+        , Network.AWS.KMS.DeleteAlias
+        , Network.AWS.KMS.DescribeKey
+        , Network.AWS.KMS.DisableKey
+        , Network.AWS.KMS.DisableKeyRotation
+        , Network.AWS.KMS.EnableKey
+        , Network.AWS.KMS.EnableKeyRotation
+        , Network.AWS.KMS.Encrypt
+        , Network.AWS.KMS.GenerateDataKey
+        , Network.AWS.KMS.GenerateDataKeyWithoutPlaintext
+        , Network.AWS.KMS.GenerateRandom
+        , Network.AWS.KMS.GetKeyPolicy
+        , Network.AWS.KMS.GetKeyRotationStatus
+        , Network.AWS.KMS.ListAliases
+        , Network.AWS.KMS.ListGrants
+        , Network.AWS.KMS.ListKeyPolicies
+        , Network.AWS.KMS.ListKeys
+        , Network.AWS.KMS.PutKeyPolicy
+        , Network.AWS.KMS.ReEncrypt
+        , Network.AWS.KMS.RetireGrant
+        , Network.AWS.KMS.RevokeGrant
+        , Network.AWS.KMS.Types
+        , Network.AWS.KMS.UpdateKeyDescription
+
+    other-modules:
+
+    build-depends:
+          amazonka-core
+        , base          >= 4.7 && < 5
diff --git a/gen/Network/AWS/KMS.hs b/gen/Network/AWS/KMS.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS.hs
@@ -0,0 +1,73 @@
+-- Module      : Network.AWS.KMS
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Amazon Key Management Service (KMS) is a managed service that makes it easy
+-- for you to create and control the encryption keys used to encrypt your
+-- data, and uses Hardware Security Modules (HSMs) to protect the security of
+-- your keys. Amazon Key Management Service is integrated with other Amazon
+-- services including Amazon EBS, Amazon S3, and Amazon Redshift. Amazon Key
+-- Management Service is also integrated with Amazon CloudTrail to provide you
+-- with logs of all key usage to help meet your regulatory and compliance
+-- needs.
+module Network.AWS.KMS
+    ( module Network.AWS.KMS.CreateAlias
+    , module Network.AWS.KMS.CreateGrant
+    , module Network.AWS.KMS.CreateKey
+    , module Network.AWS.KMS.Decrypt
+    , module Network.AWS.KMS.DeleteAlias
+    , module Network.AWS.KMS.DescribeKey
+    , module Network.AWS.KMS.DisableKey
+    , module Network.AWS.KMS.DisableKeyRotation
+    , module Network.AWS.KMS.EnableKey
+    , module Network.AWS.KMS.EnableKeyRotation
+    , module Network.AWS.KMS.Encrypt
+    , module Network.AWS.KMS.GenerateDataKey
+    , module Network.AWS.KMS.GenerateDataKeyWithoutPlaintext
+    , module Network.AWS.KMS.GenerateRandom
+    , module Network.AWS.KMS.GetKeyPolicy
+    , module Network.AWS.KMS.GetKeyRotationStatus
+    , module Network.AWS.KMS.ListAliases
+    , module Network.AWS.KMS.ListGrants
+    , module Network.AWS.KMS.ListKeyPolicies
+    , module Network.AWS.KMS.ListKeys
+    , module Network.AWS.KMS.PutKeyPolicy
+    , module Network.AWS.KMS.ReEncrypt
+    , module Network.AWS.KMS.RetireGrant
+    , module Network.AWS.KMS.RevokeGrant
+    , module Network.AWS.KMS.Types
+    , module Network.AWS.KMS.UpdateKeyDescription
+    ) where
+
+import Network.AWS.KMS.CreateAlias
+import Network.AWS.KMS.CreateGrant
+import Network.AWS.KMS.CreateKey
+import Network.AWS.KMS.Decrypt
+import Network.AWS.KMS.DeleteAlias
+import Network.AWS.KMS.DescribeKey
+import Network.AWS.KMS.DisableKey
+import Network.AWS.KMS.DisableKeyRotation
+import Network.AWS.KMS.EnableKey
+import Network.AWS.KMS.EnableKeyRotation
+import Network.AWS.KMS.Encrypt
+import Network.AWS.KMS.GenerateDataKey
+import Network.AWS.KMS.GenerateDataKeyWithoutPlaintext
+import Network.AWS.KMS.GenerateRandom
+import Network.AWS.KMS.GetKeyPolicy
+import Network.AWS.KMS.GetKeyRotationStatus
+import Network.AWS.KMS.ListAliases
+import Network.AWS.KMS.ListGrants
+import Network.AWS.KMS.ListKeyPolicies
+import Network.AWS.KMS.ListKeys
+import Network.AWS.KMS.PutKeyPolicy
+import Network.AWS.KMS.ReEncrypt
+import Network.AWS.KMS.RetireGrant
+import Network.AWS.KMS.RevokeGrant
+import Network.AWS.KMS.Types
+import Network.AWS.KMS.UpdateKeyDescription
diff --git a/gen/Network/AWS/KMS/CreateAlias.hs b/gen/Network/AWS/KMS/CreateAlias.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/CreateAlias.hs
@@ -0,0 +1,110 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.CreateAlias
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Creates a display name for a customer master key. An alias can be used to
+-- identify a key and should be unique. The console enforces a one-to-one
+-- mapping between the alias and a key. An alias name can contain only
+-- alphanumeric characters, forward slashes (/), underscores (_), and dashes
+-- (-). An alias must start with the word "alias" followed by a forward slash
+-- (alias/). An alias that begins with "aws" after the forward slash
+-- (alias/aws...) is reserved by Amazon Web Services (AWS).
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_CreateAlias.html>
+module Network.AWS.KMS.CreateAlias
+    (
+    -- * Request
+      CreateAlias
+    -- ** Request constructor
+    , createAlias
+    -- ** Request lenses
+    , caAliasName
+    , caTargetKeyId
+
+    -- * Response
+    , CreateAliasResponse
+    -- ** Response constructor
+    , createAliasResponse
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data CreateAlias = CreateAlias
+    { _caAliasName   :: Text
+    , _caTargetKeyId :: Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'CreateAlias' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'caAliasName' @::@ 'Text'
+--
+-- * 'caTargetKeyId' @::@ 'Text'
+--
+createAlias :: Text -- ^ 'caAliasName'
+            -> Text -- ^ 'caTargetKeyId'
+            -> CreateAlias
+createAlias p1 p2 = CreateAlias
+    { _caAliasName   = p1
+    , _caTargetKeyId = p2
+    }
+
+-- | String that contains the display name. Aliases that begin with AWS are
+-- reserved.
+caAliasName :: Lens' CreateAlias Text
+caAliasName = lens _caAliasName (\s a -> s { _caAliasName = a })
+
+-- | An identifier of the key for which you are creating the alias. This value
+-- cannot be another alias.
+caTargetKeyId :: Lens' CreateAlias Text
+caTargetKeyId = lens _caTargetKeyId (\s a -> s { _caTargetKeyId = a })
+
+data CreateAliasResponse = CreateAliasResponse
+    deriving (Eq, Ord, Show, Generic)
+
+-- | 'CreateAliasResponse' constructor.
+createAliasResponse :: CreateAliasResponse
+createAliasResponse = CreateAliasResponse
+
+instance ToPath CreateAlias where
+    toPath = const "/"
+
+instance ToQuery CreateAlias where
+    toQuery = const mempty
+
+instance ToHeaders CreateAlias
+
+instance ToJSON CreateAlias where
+    toJSON CreateAlias{..} = object
+        [ "AliasName"   .= _caAliasName
+        , "TargetKeyId" .= _caTargetKeyId
+        ]
+
+instance AWSRequest CreateAlias where
+    type Sv CreateAlias = KMS
+    type Rs CreateAlias = CreateAliasResponse
+
+    request  = post "CreateAlias"
+    response = nullResponse CreateAliasResponse
diff --git a/gen/Network/AWS/KMS/CreateGrant.hs b/gen/Network/AWS/KMS/CreateGrant.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/CreateGrant.hs
@@ -0,0 +1,187 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.CreateGrant
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Adds a grant to a key to specify who can access the key and under what
+-- conditions. Grants are alternate permission mechanisms to key policies. If
+-- absent, access to the key is evaluated based on IAM policies attached to
+-- the user. By default, grants do not expire. Grants can be listed, retired,
+-- or revoked as indicated by the following APIs. Typically, when you are
+-- finished using a grant, you retire it. When you want to end a grant
+-- immediately, revoke it. For more information about grants, see Grants.
+-- ListGrants RetireGrant RevokeGrant.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_CreateGrant.html>
+module Network.AWS.KMS.CreateGrant
+    (
+    -- * Request
+      CreateGrant
+    -- ** Request constructor
+    , createGrant
+    -- ** Request lenses
+    , cgConstraints
+    , cgGrantTokens
+    , cgGranteePrincipal
+    , cgKeyId
+    , cgOperations
+    , cgRetiringPrincipal
+
+    -- * Response
+    , CreateGrantResponse
+    -- ** Response constructor
+    , createGrantResponse
+    -- ** Response lenses
+    , cgrGrantId
+    , cgrGrantToken
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data CreateGrant = CreateGrant
+    { _cgConstraints       :: Maybe GrantConstraints
+    , _cgGrantTokens       :: List "GrantTokens" Text
+    , _cgGranteePrincipal  :: Text
+    , _cgKeyId             :: Text
+    , _cgOperations        :: List "Operations" Text
+    , _cgRetiringPrincipal :: Maybe Text
+    } deriving (Eq, Show)
+
+-- | 'CreateGrant' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'cgConstraints' @::@ 'Maybe' 'GrantConstraints'
+--
+-- * 'cgGrantTokens' @::@ ['Text']
+--
+-- * 'cgGranteePrincipal' @::@ 'Text'
+--
+-- * 'cgKeyId' @::@ 'Text'
+--
+-- * 'cgOperations' @::@ ['Text']
+--
+-- * 'cgRetiringPrincipal' @::@ 'Maybe' 'Text'
+--
+createGrant :: Text -- ^ 'cgKeyId'
+            -> Text -- ^ 'cgGranteePrincipal'
+            -> CreateGrant
+createGrant p1 p2 = CreateGrant
+    { _cgKeyId             = p1
+    , _cgGranteePrincipal  = p2
+    , _cgRetiringPrincipal = Nothing
+    , _cgOperations        = mempty
+    , _cgConstraints       = Nothing
+    , _cgGrantTokens       = mempty
+    }
+
+-- | Specifies the conditions under which the actions specified by the
+-- Operations parameter are allowed.
+cgConstraints :: Lens' CreateGrant (Maybe GrantConstraints)
+cgConstraints = lens _cgConstraints (\s a -> s { _cgConstraints = a })
+
+-- | List of grant tokens.
+cgGrantTokens :: Lens' CreateGrant [Text]
+cgGrantTokens = lens _cgGrantTokens (\s a -> s { _cgGrantTokens = a }) . _List
+
+-- | Principal given permission by the grant to use the key identified by the
+-- keyId parameter.
+cgGranteePrincipal :: Lens' CreateGrant Text
+cgGranteePrincipal =
+    lens _cgGranteePrincipal (\s a -> s { _cgGranteePrincipal = a })
+
+-- | A unique key identifier for a customer master key. This value can be a
+-- globally unique identifier, an ARN, or an alias.
+cgKeyId :: Lens' CreateGrant Text
+cgKeyId = lens _cgKeyId (\s a -> s { _cgKeyId = a })
+
+-- | List of operations permitted by the grant. This can be any combination of
+-- one or more of the following values: Decrypt Encrypt GenerateDataKey
+-- GenerateDataKeyWithoutPlaintext ReEncryptFrom ReEncryptTo CreateGrant.
+cgOperations :: Lens' CreateGrant [Text]
+cgOperations = lens _cgOperations (\s a -> s { _cgOperations = a }) . _List
+
+-- | Principal given permission to retire the grant. For more information, see
+-- RetireGrant.
+cgRetiringPrincipal :: Lens' CreateGrant (Maybe Text)
+cgRetiringPrincipal =
+    lens _cgRetiringPrincipal (\s a -> s { _cgRetiringPrincipal = a })
+
+data CreateGrantResponse = CreateGrantResponse
+    { _cgrGrantId    :: Maybe Text
+    , _cgrGrantToken :: Maybe Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'CreateGrantResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'cgrGrantId' @::@ 'Maybe' 'Text'
+--
+-- * 'cgrGrantToken' @::@ 'Maybe' 'Text'
+--
+createGrantResponse :: CreateGrantResponse
+createGrantResponse = CreateGrantResponse
+    { _cgrGrantToken = Nothing
+    , _cgrGrantId    = Nothing
+    }
+
+-- | Unique grant identifier. You can use the GrantId value to revoke a grant.
+cgrGrantId :: Lens' CreateGrantResponse (Maybe Text)
+cgrGrantId = lens _cgrGrantId (\s a -> s { _cgrGrantId = a })
+
+-- | The grant token. A grant token is a string that identifies a grant and
+-- which can be used to make a grant take effect immediately. A token
+-- contains all of the information necessary to create a grant.
+cgrGrantToken :: Lens' CreateGrantResponse (Maybe Text)
+cgrGrantToken = lens _cgrGrantToken (\s a -> s { _cgrGrantToken = a })
+
+instance ToPath CreateGrant where
+    toPath = const "/"
+
+instance ToQuery CreateGrant where
+    toQuery = const mempty
+
+instance ToHeaders CreateGrant
+
+instance ToJSON CreateGrant where
+    toJSON CreateGrant{..} = object
+        [ "KeyId"             .= _cgKeyId
+        , "GranteePrincipal"  .= _cgGranteePrincipal
+        , "RetiringPrincipal" .= _cgRetiringPrincipal
+        , "Operations"        .= _cgOperations
+        , "Constraints"       .= _cgConstraints
+        , "GrantTokens"       .= _cgGrantTokens
+        ]
+
+instance AWSRequest CreateGrant where
+    type Sv CreateGrant = KMS
+    type Rs CreateGrant = CreateGrantResponse
+
+    request  = post "CreateGrant"
+    response = jsonResponse
+
+instance FromJSON CreateGrantResponse where
+    parseJSON = withObject "CreateGrantResponse" $ \o -> CreateGrantResponse
+        <$> o .:? "GrantId"
+        <*> o .:? "GrantToken"
diff --git a/gen/Network/AWS/KMS/CreateKey.hs b/gen/Network/AWS/KMS/CreateKey.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/CreateKey.hs
@@ -0,0 +1,136 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.CreateKey
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Creates a customer master key. Customer master keys can be used to encrypt
+-- small amounts of data (less than 4K) directly, but they are most commonly
+-- used to encrypt or envelope data keys that are then used to encrypt
+-- customer data. For more information about data keys, see GenerateDataKey
+-- and GenerateDataKeyWithoutPlaintext.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_CreateKey.html>
+module Network.AWS.KMS.CreateKey
+    (
+    -- * Request
+      CreateKey
+    -- ** Request constructor
+    , createKey
+    -- ** Request lenses
+    , ckDescription
+    , ckKeyUsage
+    , ckPolicy
+
+    -- * Response
+    , CreateKeyResponse
+    -- ** Response constructor
+    , createKeyResponse
+    -- ** Response lenses
+    , ckrKeyMetadata
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data CreateKey = CreateKey
+    { _ckDescription :: Maybe Text
+    , _ckKeyUsage    :: Maybe Text
+    , _ckPolicy      :: Maybe Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'CreateKey' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'ckDescription' @::@ 'Maybe' 'Text'
+--
+-- * 'ckKeyUsage' @::@ 'Maybe' 'Text'
+--
+-- * 'ckPolicy' @::@ 'Maybe' 'Text'
+--
+createKey :: CreateKey
+createKey = CreateKey
+    { _ckPolicy      = Nothing
+    , _ckDescription = Nothing
+    , _ckKeyUsage    = Nothing
+    }
+
+-- | Description of the key. We recommend that you choose a description that
+-- helps your customer decide whether the key is appropriate for a task.
+ckDescription :: Lens' CreateKey (Maybe Text)
+ckDescription = lens _ckDescription (\s a -> s { _ckDescription = a })
+
+-- | Specifies the intended use of the key. Currently this defaults to
+-- ENCRYPT/DECRYPT, and only symmetric encryption and decryption are
+-- supported.
+ckKeyUsage :: Lens' CreateKey (Maybe Text)
+ckKeyUsage = lens _ckKeyUsage (\s a -> s { _ckKeyUsage = a })
+
+-- | Policy to be attached to the key. This is required and delegates back to
+-- the account. The key is the root of trust.
+ckPolicy :: Lens' CreateKey (Maybe Text)
+ckPolicy = lens _ckPolicy (\s a -> s { _ckPolicy = a })
+
+newtype CreateKeyResponse = CreateKeyResponse
+    { _ckrKeyMetadata :: Maybe KeyMetadata
+    } deriving (Eq, Show)
+
+-- | 'CreateKeyResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'ckrKeyMetadata' @::@ 'Maybe' 'KeyMetadata'
+--
+createKeyResponse :: CreateKeyResponse
+createKeyResponse = CreateKeyResponse
+    { _ckrKeyMetadata = Nothing
+    }
+
+-- | Metadata associated with the key.
+ckrKeyMetadata :: Lens' CreateKeyResponse (Maybe KeyMetadata)
+ckrKeyMetadata = lens _ckrKeyMetadata (\s a -> s { _ckrKeyMetadata = a })
+
+instance ToPath CreateKey where
+    toPath = const "/"
+
+instance ToQuery CreateKey where
+    toQuery = const mempty
+
+instance ToHeaders CreateKey
+
+instance ToJSON CreateKey where
+    toJSON CreateKey{..} = object
+        [ "Policy"      .= _ckPolicy
+        , "Description" .= _ckDescription
+        , "KeyUsage"    .= _ckKeyUsage
+        ]
+
+instance AWSRequest CreateKey where
+    type Sv CreateKey = KMS
+    type Rs CreateKey = CreateKeyResponse
+
+    request  = post "CreateKey"
+    response = jsonResponse
+
+instance FromJSON CreateKeyResponse where
+    parseJSON = withObject "CreateKeyResponse" $ \o -> CreateKeyResponse
+        <$> o .:? "KeyMetadata"
diff --git a/gen/Network/AWS/KMS/Decrypt.hs b/gen/Network/AWS/KMS/Decrypt.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/Decrypt.hs
@@ -0,0 +1,147 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.Decrypt
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Decrypts ciphertext. Ciphertext is plaintext that has been previously
+-- encrypted by using the Encrypt function.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_Decrypt.html>
+module Network.AWS.KMS.Decrypt
+    (
+    -- * Request
+      Decrypt
+    -- ** Request constructor
+    , decrypt
+    -- ** Request lenses
+    , dCiphertextBlob
+    , dEncryptionContext
+    , dGrantTokens
+
+    -- * Response
+    , DecryptResponse
+    -- ** Response constructor
+    , decryptResponse
+    -- ** Response lenses
+    , drKeyId
+    , drPlaintext
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data Decrypt = Decrypt
+    { _dCiphertextBlob    :: Base64
+    , _dEncryptionContext :: Map Text Text
+    , _dGrantTokens       :: List "GrantTokens" Text
+    } deriving (Eq, Show)
+
+-- | 'Decrypt' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'dCiphertextBlob' @::@ 'Base64'
+--
+-- * 'dEncryptionContext' @::@ 'HashMap' 'Text' 'Text'
+--
+-- * 'dGrantTokens' @::@ ['Text']
+--
+decrypt :: Base64 -- ^ 'dCiphertextBlob'
+        -> Decrypt
+decrypt p1 = Decrypt
+    { _dCiphertextBlob    = p1
+    , _dEncryptionContext = mempty
+    , _dGrantTokens       = mempty
+    }
+
+-- | Ciphertext including metadata.
+dCiphertextBlob :: Lens' Decrypt Base64
+dCiphertextBlob = lens _dCiphertextBlob (\s a -> s { _dCiphertextBlob = a })
+
+-- | The encryption context. If this was specified in the Encrypt function, it
+-- must be specified here or the decryption operation will fail. For more
+-- information, see Encryption Context.
+dEncryptionContext :: Lens' Decrypt (HashMap Text Text)
+dEncryptionContext =
+    lens _dEncryptionContext (\s a -> s { _dEncryptionContext = a })
+        . _Map
+
+-- | A list of grant tokens that represent grants which can be used to provide
+-- long term permissions to perform decryption.
+dGrantTokens :: Lens' Decrypt [Text]
+dGrantTokens = lens _dGrantTokens (\s a -> s { _dGrantTokens = a }) . _List
+
+data DecryptResponse = DecryptResponse
+    { _drKeyId     :: Maybe Text
+    , _drPlaintext :: Maybe Base64
+    } deriving (Eq, Show)
+
+-- | 'DecryptResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'drKeyId' @::@ 'Maybe' 'Text'
+--
+-- * 'drPlaintext' @::@ 'Maybe' 'Base64'
+--
+decryptResponse :: DecryptResponse
+decryptResponse = DecryptResponse
+    { _drKeyId     = Nothing
+    , _drPlaintext = Nothing
+    }
+
+-- | Unique identifier created by the system for the key. This value is always
+-- returned as long as no errors are encountered during the operation.
+drKeyId :: Lens' DecryptResponse (Maybe Text)
+drKeyId = lens _drKeyId (\s a -> s { _drKeyId = a })
+
+-- | Decrypted plaintext data. This value may not be returned if the customer
+-- master key is not available or if you didn't have permission to use it.
+drPlaintext :: Lens' DecryptResponse (Maybe Base64)
+drPlaintext = lens _drPlaintext (\s a -> s { _drPlaintext = a })
+
+instance ToPath Decrypt where
+    toPath = const "/"
+
+instance ToQuery Decrypt where
+    toQuery = const mempty
+
+instance ToHeaders Decrypt
+
+instance ToJSON Decrypt where
+    toJSON Decrypt{..} = object
+        [ "CiphertextBlob"    .= _dCiphertextBlob
+        , "EncryptionContext" .= _dEncryptionContext
+        , "GrantTokens"       .= _dGrantTokens
+        ]
+
+instance AWSRequest Decrypt where
+    type Sv Decrypt = KMS
+    type Rs Decrypt = DecryptResponse
+
+    request  = post "Decrypt"
+    response = jsonResponse
+
+instance FromJSON DecryptResponse where
+    parseJSON = withObject "DecryptResponse" $ \o -> DecryptResponse
+        <$> o .:? "KeyId"
+        <*> o .:? "Plaintext"
diff --git a/gen/Network/AWS/KMS/DeleteAlias.hs b/gen/Network/AWS/KMS/DeleteAlias.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/DeleteAlias.hs
@@ -0,0 +1,91 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.DeleteAlias
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Deletes the specified alias.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_DeleteAlias.html>
+module Network.AWS.KMS.DeleteAlias
+    (
+    -- * Request
+      DeleteAlias
+    -- ** Request constructor
+    , deleteAlias
+    -- ** Request lenses
+    , daAliasName
+
+    -- * Response
+    , DeleteAliasResponse
+    -- ** Response constructor
+    , deleteAliasResponse
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+newtype DeleteAlias = DeleteAlias
+    { _daAliasName :: Text
+    } deriving (Eq, Ord, Show, Monoid, IsString)
+
+-- | 'DeleteAlias' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'daAliasName' @::@ 'Text'
+--
+deleteAlias :: Text -- ^ 'daAliasName'
+            -> DeleteAlias
+deleteAlias p1 = DeleteAlias
+    { _daAliasName = p1
+    }
+
+-- | The alias to be deleted.
+daAliasName :: Lens' DeleteAlias Text
+daAliasName = lens _daAliasName (\s a -> s { _daAliasName = a })
+
+data DeleteAliasResponse = DeleteAliasResponse
+    deriving (Eq, Ord, Show, Generic)
+
+-- | 'DeleteAliasResponse' constructor.
+deleteAliasResponse :: DeleteAliasResponse
+deleteAliasResponse = DeleteAliasResponse
+
+instance ToPath DeleteAlias where
+    toPath = const "/"
+
+instance ToQuery DeleteAlias where
+    toQuery = const mempty
+
+instance ToHeaders DeleteAlias
+
+instance ToJSON DeleteAlias where
+    toJSON DeleteAlias{..} = object
+        [ "AliasName" .= _daAliasName
+        ]
+
+instance AWSRequest DeleteAlias where
+    type Sv DeleteAlias = KMS
+    type Rs DeleteAlias = DeleteAliasResponse
+
+    request  = post "DeleteAlias"
+    response = nullResponse DeleteAliasResponse
diff --git a/gen/Network/AWS/KMS/DescribeKey.hs b/gen/Network/AWS/KMS/DescribeKey.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/DescribeKey.hs
@@ -0,0 +1,110 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.DescribeKey
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Provides detailed information about the specified customer master key.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_DescribeKey.html>
+module Network.AWS.KMS.DescribeKey
+    (
+    -- * Request
+      DescribeKey
+    -- ** Request constructor
+    , describeKey
+    -- ** Request lenses
+    , dk1KeyId
+
+    -- * Response
+    , DescribeKeyResponse
+    -- ** Response constructor
+    , describeKeyResponse
+    -- ** Response lenses
+    , dkrKeyMetadata
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+newtype DescribeKey = DescribeKey
+    { _dk1KeyId :: Text
+    } deriving (Eq, Ord, Show, Monoid, IsString)
+
+-- | 'DescribeKey' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'dk1KeyId' @::@ 'Text'
+--
+describeKey :: Text -- ^ 'dk1KeyId'
+            -> DescribeKey
+describeKey p1 = DescribeKey
+    { _dk1KeyId = p1
+    }
+
+-- | Unique identifier of the customer master key to be described. This can be
+-- an ARN, an alias, or a globally unique identifier.
+dk1KeyId :: Lens' DescribeKey Text
+dk1KeyId = lens _dk1KeyId (\s a -> s { _dk1KeyId = a })
+
+newtype DescribeKeyResponse = DescribeKeyResponse
+    { _dkrKeyMetadata :: Maybe KeyMetadata
+    } deriving (Eq, Show)
+
+-- | 'DescribeKeyResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'dkrKeyMetadata' @::@ 'Maybe' 'KeyMetadata'
+--
+describeKeyResponse :: DescribeKeyResponse
+describeKeyResponse = DescribeKeyResponse
+    { _dkrKeyMetadata = Nothing
+    }
+
+-- | Metadata associated with the key.
+dkrKeyMetadata :: Lens' DescribeKeyResponse (Maybe KeyMetadata)
+dkrKeyMetadata = lens _dkrKeyMetadata (\s a -> s { _dkrKeyMetadata = a })
+
+instance ToPath DescribeKey where
+    toPath = const "/"
+
+instance ToQuery DescribeKey where
+    toQuery = const mempty
+
+instance ToHeaders DescribeKey
+
+instance ToJSON DescribeKey where
+    toJSON DescribeKey{..} = object
+        [ "KeyId" .= _dk1KeyId
+        ]
+
+instance AWSRequest DescribeKey where
+    type Sv DescribeKey = KMS
+    type Rs DescribeKey = DescribeKeyResponse
+
+    request  = post "DescribeKey"
+    response = jsonResponse
+
+instance FromJSON DescribeKeyResponse where
+    parseJSON = withObject "DescribeKeyResponse" $ \o -> DescribeKeyResponse
+        <$> o .:? "KeyMetadata"
diff --git a/gen/Network/AWS/KMS/DisableKey.hs b/gen/Network/AWS/KMS/DisableKey.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/DisableKey.hs
@@ -0,0 +1,92 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.DisableKey
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Marks a key as disabled, thereby preventing its use.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_DisableKey.html>
+module Network.AWS.KMS.DisableKey
+    (
+    -- * Request
+      DisableKey
+    -- ** Request constructor
+    , disableKey
+    -- ** Request lenses
+    , dkKeyId
+
+    -- * Response
+    , DisableKeyResponse
+    -- ** Response constructor
+    , disableKeyResponse
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+newtype DisableKey = DisableKey
+    { _dkKeyId :: Text
+    } deriving (Eq, Ord, Show, Monoid, IsString)
+
+-- | 'DisableKey' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'dkKeyId' @::@ 'Text'
+--
+disableKey :: Text -- ^ 'dkKeyId'
+           -> DisableKey
+disableKey p1 = DisableKey
+    { _dkKeyId = p1
+    }
+
+-- | Unique identifier of the customer master key to be disabled. This can be
+-- an ARN, an alias, or a globally unique identifier.
+dkKeyId :: Lens' DisableKey Text
+dkKeyId = lens _dkKeyId (\s a -> s { _dkKeyId = a })
+
+data DisableKeyResponse = DisableKeyResponse
+    deriving (Eq, Ord, Show, Generic)
+
+-- | 'DisableKeyResponse' constructor.
+disableKeyResponse :: DisableKeyResponse
+disableKeyResponse = DisableKeyResponse
+
+instance ToPath DisableKey where
+    toPath = const "/"
+
+instance ToQuery DisableKey where
+    toQuery = const mempty
+
+instance ToHeaders DisableKey
+
+instance ToJSON DisableKey where
+    toJSON DisableKey{..} = object
+        [ "KeyId" .= _dkKeyId
+        ]
+
+instance AWSRequest DisableKey where
+    type Sv DisableKey = KMS
+    type Rs DisableKey = DisableKeyResponse
+
+    request  = post "DisableKey"
+    response = nullResponse DisableKeyResponse
diff --git a/gen/Network/AWS/KMS/DisableKeyRotation.hs b/gen/Network/AWS/KMS/DisableKeyRotation.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/DisableKeyRotation.hs
@@ -0,0 +1,92 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.DisableKeyRotation
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Disables rotation of the specified key.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_DisableKeyRotation.html>
+module Network.AWS.KMS.DisableKeyRotation
+    (
+    -- * Request
+      DisableKeyRotation
+    -- ** Request constructor
+    , disableKeyRotation
+    -- ** Request lenses
+    , dkrKeyId
+
+    -- * Response
+    , DisableKeyRotationResponse
+    -- ** Response constructor
+    , disableKeyRotationResponse
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+newtype DisableKeyRotation = DisableKeyRotation
+    { _dkrKeyId :: Text
+    } deriving (Eq, Ord, Show, Monoid, IsString)
+
+-- | 'DisableKeyRotation' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'dkrKeyId' @::@ 'Text'
+--
+disableKeyRotation :: Text -- ^ 'dkrKeyId'
+                   -> DisableKeyRotation
+disableKeyRotation p1 = DisableKeyRotation
+    { _dkrKeyId = p1
+    }
+
+-- | Unique identifier of the customer master key for which rotation is to be
+-- disabled. This can be an ARN, an alias, or a globally unique identifier.
+dkrKeyId :: Lens' DisableKeyRotation Text
+dkrKeyId = lens _dkrKeyId (\s a -> s { _dkrKeyId = a })
+
+data DisableKeyRotationResponse = DisableKeyRotationResponse
+    deriving (Eq, Ord, Show, Generic)
+
+-- | 'DisableKeyRotationResponse' constructor.
+disableKeyRotationResponse :: DisableKeyRotationResponse
+disableKeyRotationResponse = DisableKeyRotationResponse
+
+instance ToPath DisableKeyRotation where
+    toPath = const "/"
+
+instance ToQuery DisableKeyRotation where
+    toQuery = const mempty
+
+instance ToHeaders DisableKeyRotation
+
+instance ToJSON DisableKeyRotation where
+    toJSON DisableKeyRotation{..} = object
+        [ "KeyId" .= _dkrKeyId
+        ]
+
+instance AWSRequest DisableKeyRotation where
+    type Sv DisableKeyRotation = KMS
+    type Rs DisableKeyRotation = DisableKeyRotationResponse
+
+    request  = post "DisableKeyRotation"
+    response = nullResponse DisableKeyRotationResponse
diff --git a/gen/Network/AWS/KMS/EnableKey.hs b/gen/Network/AWS/KMS/EnableKey.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/EnableKey.hs
@@ -0,0 +1,93 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.EnableKey
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Marks a key as enabled, thereby permitting its use. You can have up to 25
+-- enabled keys at one time.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_EnableKey.html>
+module Network.AWS.KMS.EnableKey
+    (
+    -- * Request
+      EnableKey
+    -- ** Request constructor
+    , enableKey
+    -- ** Request lenses
+    , ekKeyId
+
+    -- * Response
+    , EnableKeyResponse
+    -- ** Response constructor
+    , enableKeyResponse
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+newtype EnableKey = EnableKey
+    { _ekKeyId :: Text
+    } deriving (Eq, Ord, Show, Monoid, IsString)
+
+-- | 'EnableKey' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'ekKeyId' @::@ 'Text'
+--
+enableKey :: Text -- ^ 'ekKeyId'
+          -> EnableKey
+enableKey p1 = EnableKey
+    { _ekKeyId = p1
+    }
+
+-- | Unique identifier of the customer master key to be enabled. This can be
+-- an ARN, an alias, or a globally unique identifier.
+ekKeyId :: Lens' EnableKey Text
+ekKeyId = lens _ekKeyId (\s a -> s { _ekKeyId = a })
+
+data EnableKeyResponse = EnableKeyResponse
+    deriving (Eq, Ord, Show, Generic)
+
+-- | 'EnableKeyResponse' constructor.
+enableKeyResponse :: EnableKeyResponse
+enableKeyResponse = EnableKeyResponse
+
+instance ToPath EnableKey where
+    toPath = const "/"
+
+instance ToQuery EnableKey where
+    toQuery = const mempty
+
+instance ToHeaders EnableKey
+
+instance ToJSON EnableKey where
+    toJSON EnableKey{..} = object
+        [ "KeyId" .= _ekKeyId
+        ]
+
+instance AWSRequest EnableKey where
+    type Sv EnableKey = KMS
+    type Rs EnableKey = EnableKeyResponse
+
+    request  = post "EnableKey"
+    response = nullResponse EnableKeyResponse
diff --git a/gen/Network/AWS/KMS/EnableKeyRotation.hs b/gen/Network/AWS/KMS/EnableKeyRotation.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/EnableKeyRotation.hs
@@ -0,0 +1,92 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.EnableKeyRotation
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Enables rotation of the specified customer master key.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_EnableKeyRotation.html>
+module Network.AWS.KMS.EnableKeyRotation
+    (
+    -- * Request
+      EnableKeyRotation
+    -- ** Request constructor
+    , enableKeyRotation
+    -- ** Request lenses
+    , ekrKeyId
+
+    -- * Response
+    , EnableKeyRotationResponse
+    -- ** Response constructor
+    , enableKeyRotationResponse
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+newtype EnableKeyRotation = EnableKeyRotation
+    { _ekrKeyId :: Text
+    } deriving (Eq, Ord, Show, Monoid, IsString)
+
+-- | 'EnableKeyRotation' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'ekrKeyId' @::@ 'Text'
+--
+enableKeyRotation :: Text -- ^ 'ekrKeyId'
+                  -> EnableKeyRotation
+enableKeyRotation p1 = EnableKeyRotation
+    { _ekrKeyId = p1
+    }
+
+-- | Unique identifier of the customer master key for which rotation is to be
+-- enabled. This can be an ARN, an alias, or a globally unique identifier.
+ekrKeyId :: Lens' EnableKeyRotation Text
+ekrKeyId = lens _ekrKeyId (\s a -> s { _ekrKeyId = a })
+
+data EnableKeyRotationResponse = EnableKeyRotationResponse
+    deriving (Eq, Ord, Show, Generic)
+
+-- | 'EnableKeyRotationResponse' constructor.
+enableKeyRotationResponse :: EnableKeyRotationResponse
+enableKeyRotationResponse = EnableKeyRotationResponse
+
+instance ToPath EnableKeyRotation where
+    toPath = const "/"
+
+instance ToQuery EnableKeyRotation where
+    toQuery = const mempty
+
+instance ToHeaders EnableKeyRotation
+
+instance ToJSON EnableKeyRotation where
+    toJSON EnableKeyRotation{..} = object
+        [ "KeyId" .= _ekrKeyId
+        ]
+
+instance AWSRequest EnableKeyRotation where
+    type Sv EnableKeyRotation = KMS
+    type Rs EnableKeyRotation = EnableKeyRotationResponse
+
+    request  = post "EnableKeyRotation"
+    response = nullResponse EnableKeyRotationResponse
diff --git a/gen/Network/AWS/KMS/Encrypt.hs b/gen/Network/AWS/KMS/Encrypt.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/Encrypt.hs
@@ -0,0 +1,156 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.Encrypt
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Encrypts plaintext into ciphertext by using a customer master key.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_Encrypt.html>
+module Network.AWS.KMS.Encrypt
+    (
+    -- * Request
+      Encrypt
+    -- ** Request constructor
+    , encrypt
+    -- ** Request lenses
+    , eEncryptionContext
+    , eGrantTokens
+    , eKeyId
+    , ePlaintext
+
+    -- * Response
+    , EncryptResponse
+    -- ** Response constructor
+    , encryptResponse
+    -- ** Response lenses
+    , erCiphertextBlob
+    , erKeyId
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data Encrypt = Encrypt
+    { _eEncryptionContext :: Map Text Text
+    , _eGrantTokens       :: List "GrantTokens" Text
+    , _eKeyId             :: Text
+    , _ePlaintext         :: Base64
+    } deriving (Eq, Show)
+
+-- | 'Encrypt' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'eEncryptionContext' @::@ 'HashMap' 'Text' 'Text'
+--
+-- * 'eGrantTokens' @::@ ['Text']
+--
+-- * 'eKeyId' @::@ 'Text'
+--
+-- * 'ePlaintext' @::@ 'Base64'
+--
+encrypt :: Text -- ^ 'eKeyId'
+        -> Base64 -- ^ 'ePlaintext'
+        -> Encrypt
+encrypt p1 p2 = Encrypt
+    { _eKeyId             = p1
+    , _ePlaintext         = p2
+    , _eEncryptionContext = mempty
+    , _eGrantTokens       = mempty
+    }
+
+-- | Name:value pair that specifies the encryption context to be used for
+-- authenticated encryption. For more information, see Authenticated
+-- Encryption.
+eEncryptionContext :: Lens' Encrypt (HashMap Text Text)
+eEncryptionContext =
+    lens _eEncryptionContext (\s a -> s { _eEncryptionContext = a })
+        . _Map
+
+-- | A list of grant tokens that represent grants which can be used to provide
+-- long term permissions to perform encryption.
+eGrantTokens :: Lens' Encrypt [Text]
+eGrantTokens = lens _eGrantTokens (\s a -> s { _eGrantTokens = a }) . _List
+
+-- | Unique identifier of the customer master. This can be an ARN, an alias,
+-- or the Key ID.
+eKeyId :: Lens' Encrypt Text
+eKeyId = lens _eKeyId (\s a -> s { _eKeyId = a })
+
+-- | Data to be encrypted.
+ePlaintext :: Lens' Encrypt Base64
+ePlaintext = lens _ePlaintext (\s a -> s { _ePlaintext = a })
+
+data EncryptResponse = EncryptResponse
+    { _erCiphertextBlob :: Maybe Base64
+    , _erKeyId          :: Maybe Text
+    } deriving (Eq, Show)
+
+-- | 'EncryptResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'erCiphertextBlob' @::@ 'Maybe' 'Base64'
+--
+-- * 'erKeyId' @::@ 'Maybe' 'Text'
+--
+encryptResponse :: EncryptResponse
+encryptResponse = EncryptResponse
+    { _erCiphertextBlob = Nothing
+    , _erKeyId          = Nothing
+    }
+
+-- | The encrypted plaintext.
+erCiphertextBlob :: Lens' EncryptResponse (Maybe Base64)
+erCiphertextBlob = lens _erCiphertextBlob (\s a -> s { _erCiphertextBlob = a })
+
+-- | The ID of the key used during encryption.
+erKeyId :: Lens' EncryptResponse (Maybe Text)
+erKeyId = lens _erKeyId (\s a -> s { _erKeyId = a })
+
+instance ToPath Encrypt where
+    toPath = const "/"
+
+instance ToQuery Encrypt where
+    toQuery = const mempty
+
+instance ToHeaders Encrypt
+
+instance ToJSON Encrypt where
+    toJSON Encrypt{..} = object
+        [ "KeyId"             .= _eKeyId
+        , "Plaintext"         .= _ePlaintext
+        , "EncryptionContext" .= _eEncryptionContext
+        , "GrantTokens"       .= _eGrantTokens
+        ]
+
+instance AWSRequest Encrypt where
+    type Sv Encrypt = KMS
+    type Rs Encrypt = EncryptResponse
+
+    request  = post "Encrypt"
+    response = jsonResponse
+
+instance FromJSON EncryptResponse where
+    parseJSON = withObject "EncryptResponse" $ \o -> EncryptResponse
+        <$> o .:? "CiphertextBlob"
+        <*> o .:? "KeyId"
diff --git a/gen/Network/AWS/KMS/GenerateDataKey.hs b/gen/Network/AWS/KMS/GenerateDataKey.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/GenerateDataKey.hs
@@ -0,0 +1,183 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.GenerateDataKey
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Generates a secure data key. Data keys are used to encrypt and decrypt
+-- data. They are wrapped by customer master keys.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_GenerateDataKey.html>
+module Network.AWS.KMS.GenerateDataKey
+    (
+    -- * Request
+      GenerateDataKey
+    -- ** Request constructor
+    , generateDataKey
+    -- ** Request lenses
+    , gdkEncryptionContext
+    , gdkGrantTokens
+    , gdkKeyId
+    , gdkKeySpec
+    , gdkNumberOfBytes
+
+    -- * Response
+    , GenerateDataKeyResponse
+    -- ** Response constructor
+    , generateDataKeyResponse
+    -- ** Response lenses
+    , gdkrCiphertextBlob
+    , gdkrKeyId
+    , gdkrPlaintext
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data GenerateDataKey = GenerateDataKey
+    { _gdkEncryptionContext :: Map Text Text
+    , _gdkGrantTokens       :: List "GrantTokens" Text
+    , _gdkKeyId             :: Text
+    , _gdkKeySpec           :: Maybe Text
+    , _gdkNumberOfBytes     :: Maybe Nat
+    } deriving (Eq, Show)
+
+-- | 'GenerateDataKey' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'gdkEncryptionContext' @::@ 'HashMap' 'Text' 'Text'
+--
+-- * 'gdkGrantTokens' @::@ ['Text']
+--
+-- * 'gdkKeyId' @::@ 'Text'
+--
+-- * 'gdkKeySpec' @::@ 'Maybe' 'Text'
+--
+-- * 'gdkNumberOfBytes' @::@ 'Maybe' 'Natural'
+--
+generateDataKey :: Text -- ^ 'gdkKeyId'
+                -> GenerateDataKey
+generateDataKey p1 = GenerateDataKey
+    { _gdkKeyId             = p1
+    , _gdkEncryptionContext = mempty
+    , _gdkNumberOfBytes     = Nothing
+    , _gdkKeySpec           = Nothing
+    , _gdkGrantTokens       = mempty
+    }
+
+-- | Name/value pair that contains additional data to be authenticated during
+-- the encryption and decryption processes that use the key. This value is
+-- logged by AWS CloudTrail to provide context around the data encrypted by
+-- the key.
+gdkEncryptionContext :: Lens' GenerateDataKey (HashMap Text Text)
+gdkEncryptionContext =
+    lens _gdkEncryptionContext (\s a -> s { _gdkEncryptionContext = a })
+        . _Map
+
+-- | A list of grant tokens that represent grants which can be used to provide
+-- long term permissions to generate a key.
+gdkGrantTokens :: Lens' GenerateDataKey [Text]
+gdkGrantTokens = lens _gdkGrantTokens (\s a -> s { _gdkGrantTokens = a }) . _List
+
+-- | Unique identifier of the key. This can be an ARN, an alias, or a globally
+-- unique identifier.
+gdkKeyId :: Lens' GenerateDataKey Text
+gdkKeyId = lens _gdkKeyId (\s a -> s { _gdkKeyId = a })
+
+-- | Value that identifies the encryption algorithm and key size to generate a
+-- data key for. Currently this can be AES_128 or AES_256.
+gdkKeySpec :: Lens' GenerateDataKey (Maybe Text)
+gdkKeySpec = lens _gdkKeySpec (\s a -> s { _gdkKeySpec = a })
+
+-- | Integer that contains the number of bytes to generate. Common values are
+-- 128, 256, 512, 1024 and so on. 1024 is the current limit.
+gdkNumberOfBytes :: Lens' GenerateDataKey (Maybe Natural)
+gdkNumberOfBytes = lens _gdkNumberOfBytes (\s a -> s { _gdkNumberOfBytes = a }) . mapping _Nat
+
+data GenerateDataKeyResponse = GenerateDataKeyResponse
+    { _gdkrCiphertextBlob :: Maybe Base64
+    , _gdkrKeyId          :: Maybe Text
+    , _gdkrPlaintext      :: Maybe Base64
+    } deriving (Eq, Show)
+
+-- | 'GenerateDataKeyResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'gdkrCiphertextBlob' @::@ 'Maybe' 'Base64'
+--
+-- * 'gdkrKeyId' @::@ 'Maybe' 'Text'
+--
+-- * 'gdkrPlaintext' @::@ 'Maybe' 'Base64'
+--
+generateDataKeyResponse :: GenerateDataKeyResponse
+generateDataKeyResponse = GenerateDataKeyResponse
+    { _gdkrCiphertextBlob = Nothing
+    , _gdkrPlaintext      = Nothing
+    , _gdkrKeyId          = Nothing
+    }
+
+-- | Ciphertext that contains the wrapped key. You must store the blob and
+-- encryption context so that the ciphertext can be decrypted. You must
+-- provide both the ciphertext blob and the encryption context.
+gdkrCiphertextBlob :: Lens' GenerateDataKeyResponse (Maybe Base64)
+gdkrCiphertextBlob =
+    lens _gdkrCiphertextBlob (\s a -> s { _gdkrCiphertextBlob = a })
+
+-- | System generated unique identifier for the key.
+gdkrKeyId :: Lens' GenerateDataKeyResponse (Maybe Text)
+gdkrKeyId = lens _gdkrKeyId (\s a -> s { _gdkrKeyId = a })
+
+-- | Plaintext that contains the unwrapped key. Use this for encryption and
+-- decryption and then remove it from memory as soon as possible.
+gdkrPlaintext :: Lens' GenerateDataKeyResponse (Maybe Base64)
+gdkrPlaintext = lens _gdkrPlaintext (\s a -> s { _gdkrPlaintext = a })
+
+instance ToPath GenerateDataKey where
+    toPath = const "/"
+
+instance ToQuery GenerateDataKey where
+    toQuery = const mempty
+
+instance ToHeaders GenerateDataKey
+
+instance ToJSON GenerateDataKey where
+    toJSON GenerateDataKey{..} = object
+        [ "KeyId"             .= _gdkKeyId
+        , "EncryptionContext" .= _gdkEncryptionContext
+        , "NumberOfBytes"     .= _gdkNumberOfBytes
+        , "KeySpec"           .= _gdkKeySpec
+        , "GrantTokens"       .= _gdkGrantTokens
+        ]
+
+instance AWSRequest GenerateDataKey where
+    type Sv GenerateDataKey = KMS
+    type Rs GenerateDataKey = GenerateDataKeyResponse
+
+    request  = post "GenerateDataKey"
+    response = jsonResponse
+
+instance FromJSON GenerateDataKeyResponse where
+    parseJSON = withObject "GenerateDataKeyResponse" $ \o -> GenerateDataKeyResponse
+        <$> o .:? "CiphertextBlob"
+        <*> o .:? "KeyId"
+        <*> o .:? "Plaintext"
diff --git a/gen/Network/AWS/KMS/GenerateDataKeyWithoutPlaintext.hs b/gen/Network/AWS/KMS/GenerateDataKeyWithoutPlaintext.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/GenerateDataKeyWithoutPlaintext.hs
@@ -0,0 +1,171 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.GenerateDataKeyWithoutPlaintext
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Returns a key wrapped by a customer master key without the plaintext copy
+-- of that key. To retrieve the plaintext, see GenerateDataKey.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_GenerateDataKeyWithoutPlaintext.html>
+module Network.AWS.KMS.GenerateDataKeyWithoutPlaintext
+    (
+    -- * Request
+      GenerateDataKeyWithoutPlaintext
+    -- ** Request constructor
+    , generateDataKeyWithoutPlaintext
+    -- ** Request lenses
+    , gdkwpEncryptionContext
+    , gdkwpGrantTokens
+    , gdkwpKeyId
+    , gdkwpKeySpec
+    , gdkwpNumberOfBytes
+
+    -- * Response
+    , GenerateDataKeyWithoutPlaintextResponse
+    -- ** Response constructor
+    , generateDataKeyWithoutPlaintextResponse
+    -- ** Response lenses
+    , gdkwprCiphertextBlob
+    , gdkwprKeyId
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data GenerateDataKeyWithoutPlaintext = GenerateDataKeyWithoutPlaintext
+    { _gdkwpEncryptionContext :: Map Text Text
+    , _gdkwpGrantTokens       :: List "GrantTokens" Text
+    , _gdkwpKeyId             :: Text
+    , _gdkwpKeySpec           :: Maybe Text
+    , _gdkwpNumberOfBytes     :: Maybe Nat
+    } deriving (Eq, Show)
+
+-- | 'GenerateDataKeyWithoutPlaintext' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'gdkwpEncryptionContext' @::@ 'HashMap' 'Text' 'Text'
+--
+-- * 'gdkwpGrantTokens' @::@ ['Text']
+--
+-- * 'gdkwpKeyId' @::@ 'Text'
+--
+-- * 'gdkwpKeySpec' @::@ 'Maybe' 'Text'
+--
+-- * 'gdkwpNumberOfBytes' @::@ 'Maybe' 'Natural'
+--
+generateDataKeyWithoutPlaintext :: Text -- ^ 'gdkwpKeyId'
+                                -> GenerateDataKeyWithoutPlaintext
+generateDataKeyWithoutPlaintext p1 = GenerateDataKeyWithoutPlaintext
+    { _gdkwpKeyId             = p1
+    , _gdkwpEncryptionContext = mempty
+    , _gdkwpKeySpec           = Nothing
+    , _gdkwpNumberOfBytes     = Nothing
+    , _gdkwpGrantTokens       = mempty
+    }
+
+-- | Name:value pair that contains additional data to be authenticated during
+-- the encryption and decryption processes.
+gdkwpEncryptionContext :: Lens' GenerateDataKeyWithoutPlaintext (HashMap Text Text)
+gdkwpEncryptionContext =
+    lens _gdkwpEncryptionContext (\s a -> s { _gdkwpEncryptionContext = a })
+        . _Map
+
+-- | A list of grant tokens that represent grants which can be used to provide
+-- long term permissions to generate a key.
+gdkwpGrantTokens :: Lens' GenerateDataKeyWithoutPlaintext [Text]
+gdkwpGrantTokens = lens _gdkwpGrantTokens (\s a -> s { _gdkwpGrantTokens = a }) . _List
+
+-- | Unique identifier of the key. This can be an ARN, an alias, or a globally
+-- unique identifier.
+gdkwpKeyId :: Lens' GenerateDataKeyWithoutPlaintext Text
+gdkwpKeyId = lens _gdkwpKeyId (\s a -> s { _gdkwpKeyId = a })
+
+-- | Value that identifies the encryption algorithm and key size. Currently
+-- this can be AES_128 or AES_256.
+gdkwpKeySpec :: Lens' GenerateDataKeyWithoutPlaintext (Maybe Text)
+gdkwpKeySpec = lens _gdkwpKeySpec (\s a -> s { _gdkwpKeySpec = a })
+
+-- | Integer that contains the number of bytes to generate. Common values are
+-- 128, 256, 512, 1024 and so on.
+gdkwpNumberOfBytes :: Lens' GenerateDataKeyWithoutPlaintext (Maybe Natural)
+gdkwpNumberOfBytes =
+    lens _gdkwpNumberOfBytes (\s a -> s { _gdkwpNumberOfBytes = a })
+        . mapping _Nat
+
+data GenerateDataKeyWithoutPlaintextResponse = GenerateDataKeyWithoutPlaintextResponse
+    { _gdkwprCiphertextBlob :: Maybe Base64
+    , _gdkwprKeyId          :: Maybe Text
+    } deriving (Eq, Show)
+
+-- | 'GenerateDataKeyWithoutPlaintextResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'gdkwprCiphertextBlob' @::@ 'Maybe' 'Base64'
+--
+-- * 'gdkwprKeyId' @::@ 'Maybe' 'Text'
+--
+generateDataKeyWithoutPlaintextResponse :: GenerateDataKeyWithoutPlaintextResponse
+generateDataKeyWithoutPlaintextResponse = GenerateDataKeyWithoutPlaintextResponse
+    { _gdkwprCiphertextBlob = Nothing
+    , _gdkwprKeyId          = Nothing
+    }
+
+-- | Ciphertext that contains the wrapped key. You must store the blob and
+-- encryption context so that the key can be used in a future operation.
+gdkwprCiphertextBlob :: Lens' GenerateDataKeyWithoutPlaintextResponse (Maybe Base64)
+gdkwprCiphertextBlob =
+    lens _gdkwprCiphertextBlob (\s a -> s { _gdkwprCiphertextBlob = a })
+
+-- | System generated unique identifier for the key.
+gdkwprKeyId :: Lens' GenerateDataKeyWithoutPlaintextResponse (Maybe Text)
+gdkwprKeyId = lens _gdkwprKeyId (\s a -> s { _gdkwprKeyId = a })
+
+instance ToPath GenerateDataKeyWithoutPlaintext where
+    toPath = const "/"
+
+instance ToQuery GenerateDataKeyWithoutPlaintext where
+    toQuery = const mempty
+
+instance ToHeaders GenerateDataKeyWithoutPlaintext
+
+instance ToJSON GenerateDataKeyWithoutPlaintext where
+    toJSON GenerateDataKeyWithoutPlaintext{..} = object
+        [ "KeyId"             .= _gdkwpKeyId
+        , "EncryptionContext" .= _gdkwpEncryptionContext
+        , "KeySpec"           .= _gdkwpKeySpec
+        , "NumberOfBytes"     .= _gdkwpNumberOfBytes
+        , "GrantTokens"       .= _gdkwpGrantTokens
+        ]
+
+instance AWSRequest GenerateDataKeyWithoutPlaintext where
+    type Sv GenerateDataKeyWithoutPlaintext = KMS
+    type Rs GenerateDataKeyWithoutPlaintext = GenerateDataKeyWithoutPlaintextResponse
+
+    request  = post "GenerateDataKeyWithoutPlaintext"
+    response = jsonResponse
+
+instance FromJSON GenerateDataKeyWithoutPlaintextResponse where
+    parseJSON = withObject "GenerateDataKeyWithoutPlaintextResponse" $ \o -> GenerateDataKeyWithoutPlaintextResponse
+        <$> o .:? "CiphertextBlob"
+        <*> o .:? "KeyId"
diff --git a/gen/Network/AWS/KMS/GenerateRandom.hs b/gen/Network/AWS/KMS/GenerateRandom.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/GenerateRandom.hs
@@ -0,0 +1,109 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.GenerateRandom
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Generates an unpredictable byte string.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_GenerateRandom.html>
+module Network.AWS.KMS.GenerateRandom
+    (
+    -- * Request
+      GenerateRandom
+    -- ** Request constructor
+    , generateRandom
+    -- ** Request lenses
+    , grNumberOfBytes
+
+    -- * Response
+    , GenerateRandomResponse
+    -- ** Response constructor
+    , generateRandomResponse
+    -- ** Response lenses
+    , grrPlaintext
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+newtype GenerateRandom = GenerateRandom
+    { _grNumberOfBytes :: Maybe Nat
+    } deriving (Eq, Ord, Show)
+
+-- | 'GenerateRandom' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'grNumberOfBytes' @::@ 'Maybe' 'Natural'
+--
+generateRandom :: GenerateRandom
+generateRandom = GenerateRandom
+    { _grNumberOfBytes = Nothing
+    }
+
+-- | Integer that contains the number of bytes to generate. Common values are
+-- 128, 256, 512, 1024 and so on. The current limit is 1024 bytes.
+grNumberOfBytes :: Lens' GenerateRandom (Maybe Natural)
+grNumberOfBytes = lens _grNumberOfBytes (\s a -> s { _grNumberOfBytes = a }) . mapping _Nat
+
+newtype GenerateRandomResponse = GenerateRandomResponse
+    { _grrPlaintext :: Maybe Base64
+    } deriving (Eq, Show)
+
+-- | 'GenerateRandomResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'grrPlaintext' @::@ 'Maybe' 'Base64'
+--
+generateRandomResponse :: GenerateRandomResponse
+generateRandomResponse = GenerateRandomResponse
+    { _grrPlaintext = Nothing
+    }
+
+-- | Plaintext that contains the unpredictable byte string.
+grrPlaintext :: Lens' GenerateRandomResponse (Maybe Base64)
+grrPlaintext = lens _grrPlaintext (\s a -> s { _grrPlaintext = a })
+
+instance ToPath GenerateRandom where
+    toPath = const "/"
+
+instance ToQuery GenerateRandom where
+    toQuery = const mempty
+
+instance ToHeaders GenerateRandom
+
+instance ToJSON GenerateRandom where
+    toJSON GenerateRandom{..} = object
+        [ "NumberOfBytes" .= _grNumberOfBytes
+        ]
+
+instance AWSRequest GenerateRandom where
+    type Sv GenerateRandom = KMS
+    type Rs GenerateRandom = GenerateRandomResponse
+
+    request  = post "GenerateRandom"
+    response = jsonResponse
+
+instance FromJSON GenerateRandomResponse where
+    parseJSON = withObject "GenerateRandomResponse" $ \o -> GenerateRandomResponse
+        <$> o .:? "Plaintext"
diff --git a/gen/Network/AWS/KMS/GetKeyPolicy.hs b/gen/Network/AWS/KMS/GetKeyPolicy.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/GetKeyPolicy.hs
@@ -0,0 +1,122 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.GetKeyPolicy
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Retrieves a policy attached to the specified key.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_GetKeyPolicy.html>
+module Network.AWS.KMS.GetKeyPolicy
+    (
+    -- * Request
+      GetKeyPolicy
+    -- ** Request constructor
+    , getKeyPolicy
+    -- ** Request lenses
+    , gkpKeyId
+    , gkpPolicyName
+
+    -- * Response
+    , GetKeyPolicyResponse
+    -- ** Response constructor
+    , getKeyPolicyResponse
+    -- ** Response lenses
+    , gkprPolicy
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data GetKeyPolicy = GetKeyPolicy
+    { _gkpKeyId      :: Text
+    , _gkpPolicyName :: Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'GetKeyPolicy' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'gkpKeyId' @::@ 'Text'
+--
+-- * 'gkpPolicyName' @::@ 'Text'
+--
+getKeyPolicy :: Text -- ^ 'gkpKeyId'
+             -> Text -- ^ 'gkpPolicyName'
+             -> GetKeyPolicy
+getKeyPolicy p1 p2 = GetKeyPolicy
+    { _gkpKeyId      = p1
+    , _gkpPolicyName = p2
+    }
+
+-- | Unique identifier of the key. This can be an ARN, an alias, or a globally
+-- unique identifier.
+gkpKeyId :: Lens' GetKeyPolicy Text
+gkpKeyId = lens _gkpKeyId (\s a -> s { _gkpKeyId = a })
+
+-- | String that contains the name of the policy. Currently, this must be
+-- "default". Policy names can be discovered by calling ListKeyPolicies.
+gkpPolicyName :: Lens' GetKeyPolicy Text
+gkpPolicyName = lens _gkpPolicyName (\s a -> s { _gkpPolicyName = a })
+
+newtype GetKeyPolicyResponse = GetKeyPolicyResponse
+    { _gkprPolicy :: Maybe Text
+    } deriving (Eq, Ord, Show, Monoid)
+
+-- | 'GetKeyPolicyResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'gkprPolicy' @::@ 'Maybe' 'Text'
+--
+getKeyPolicyResponse :: GetKeyPolicyResponse
+getKeyPolicyResponse = GetKeyPolicyResponse
+    { _gkprPolicy = Nothing
+    }
+
+-- | A policy document in JSON format.
+gkprPolicy :: Lens' GetKeyPolicyResponse (Maybe Text)
+gkprPolicy = lens _gkprPolicy (\s a -> s { _gkprPolicy = a })
+
+instance ToPath GetKeyPolicy where
+    toPath = const "/"
+
+instance ToQuery GetKeyPolicy where
+    toQuery = const mempty
+
+instance ToHeaders GetKeyPolicy
+
+instance ToJSON GetKeyPolicy where
+    toJSON GetKeyPolicy{..} = object
+        [ "KeyId"      .= _gkpKeyId
+        , "PolicyName" .= _gkpPolicyName
+        ]
+
+instance AWSRequest GetKeyPolicy where
+    type Sv GetKeyPolicy = KMS
+    type Rs GetKeyPolicy = GetKeyPolicyResponse
+
+    request  = post "GetKeyPolicy"
+    response = jsonResponse
+
+instance FromJSON GetKeyPolicyResponse where
+    parseJSON = withObject "GetKeyPolicyResponse" $ \o -> GetKeyPolicyResponse
+        <$> o .:? "Policy"
diff --git a/gen/Network/AWS/KMS/GetKeyRotationStatus.hs b/gen/Network/AWS/KMS/GetKeyRotationStatus.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/GetKeyRotationStatus.hs
@@ -0,0 +1,112 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.GetKeyRotationStatus
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Retrieves a Boolean value that indicates whether key rotation is enabled
+-- for the specified key.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_GetKeyRotationStatus.html>
+module Network.AWS.KMS.GetKeyRotationStatus
+    (
+    -- * Request
+      GetKeyRotationStatus
+    -- ** Request constructor
+    , getKeyRotationStatus
+    -- ** Request lenses
+    , gkrsKeyId
+
+    -- * Response
+    , GetKeyRotationStatusResponse
+    -- ** Response constructor
+    , getKeyRotationStatusResponse
+    -- ** Response lenses
+    , gkrsrKeyRotationEnabled
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+newtype GetKeyRotationStatus = GetKeyRotationStatus
+    { _gkrsKeyId :: Text
+    } deriving (Eq, Ord, Show, Monoid, IsString)
+
+-- | 'GetKeyRotationStatus' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'gkrsKeyId' @::@ 'Text'
+--
+getKeyRotationStatus :: Text -- ^ 'gkrsKeyId'
+                     -> GetKeyRotationStatus
+getKeyRotationStatus p1 = GetKeyRotationStatus
+    { _gkrsKeyId = p1
+    }
+
+-- | Unique identifier of the key. This can be an ARN, an alias, or a globally
+-- unique identifier.
+gkrsKeyId :: Lens' GetKeyRotationStatus Text
+gkrsKeyId = lens _gkrsKeyId (\s a -> s { _gkrsKeyId = a })
+
+newtype GetKeyRotationStatusResponse = GetKeyRotationStatusResponse
+    { _gkrsrKeyRotationEnabled :: Maybe Bool
+    } deriving (Eq, Ord, Show)
+
+-- | 'GetKeyRotationStatusResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'gkrsrKeyRotationEnabled' @::@ 'Maybe' 'Bool'
+--
+getKeyRotationStatusResponse :: GetKeyRotationStatusResponse
+getKeyRotationStatusResponse = GetKeyRotationStatusResponse
+    { _gkrsrKeyRotationEnabled = Nothing
+    }
+
+-- | A Boolean value that specifies whether key rotation is enabled.
+gkrsrKeyRotationEnabled :: Lens' GetKeyRotationStatusResponse (Maybe Bool)
+gkrsrKeyRotationEnabled =
+    lens _gkrsrKeyRotationEnabled (\s a -> s { _gkrsrKeyRotationEnabled = a })
+
+instance ToPath GetKeyRotationStatus where
+    toPath = const "/"
+
+instance ToQuery GetKeyRotationStatus where
+    toQuery = const mempty
+
+instance ToHeaders GetKeyRotationStatus
+
+instance ToJSON GetKeyRotationStatus where
+    toJSON GetKeyRotationStatus{..} = object
+        [ "KeyId" .= _gkrsKeyId
+        ]
+
+instance AWSRequest GetKeyRotationStatus where
+    type Sv GetKeyRotationStatus = KMS
+    type Rs GetKeyRotationStatus = GetKeyRotationStatusResponse
+
+    request  = post "GetKeyRotationStatus"
+    response = jsonResponse
+
+instance FromJSON GetKeyRotationStatusResponse where
+    parseJSON = withObject "GetKeyRotationStatusResponse" $ \o -> GetKeyRotationStatusResponse
+        <$> o .:? "KeyRotationEnabled"
diff --git a/gen/Network/AWS/KMS/ListAliases.hs b/gen/Network/AWS/KMS/ListAliases.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/ListAliases.hs
@@ -0,0 +1,147 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.ListAliases
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Lists all of the key aliases in the account.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_ListAliases.html>
+module Network.AWS.KMS.ListAliases
+    (
+    -- * Request
+      ListAliases
+    -- ** Request constructor
+    , listAliases
+    -- ** Request lenses
+    , laLimit
+    , laMarker
+
+    -- * Response
+    , ListAliasesResponse
+    -- ** Response constructor
+    , listAliasesResponse
+    -- ** Response lenses
+    , larAliases
+    , larNextMarker
+    , larTruncated
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data ListAliases = ListAliases
+    { _laLimit  :: Maybe Nat
+    , _laMarker :: Maybe Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'ListAliases' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'laLimit' @::@ 'Maybe' 'Natural'
+--
+-- * 'laMarker' @::@ 'Maybe' 'Text'
+--
+listAliases :: ListAliases
+listAliases = ListAliases
+    { _laLimit  = Nothing
+    , _laMarker = Nothing
+    }
+
+-- | Specify this parameter when paginating results to indicate the maximum
+-- number of aliases you want in each response. If there are additional
+-- aliases beyond the maximum you specify, the Truncated response element
+-- will be set to true.
+laLimit :: Lens' ListAliases (Maybe Natural)
+laLimit = lens _laLimit (\s a -> s { _laLimit = a }) . mapping _Nat
+
+-- | Use this parameter when paginating results, and only in a subsequent
+-- request after you've received a response where the results are truncated.
+-- Set it to the value of the NextMarker element in the response you just
+-- received.
+laMarker :: Lens' ListAliases (Maybe Text)
+laMarker = lens _laMarker (\s a -> s { _laMarker = a })
+
+data ListAliasesResponse = ListAliasesResponse
+    { _larAliases    :: List "Aliases" AliasListEntry
+    , _larNextMarker :: Maybe Text
+    , _larTruncated  :: Maybe Bool
+    } deriving (Eq, Show)
+
+-- | 'ListAliasesResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'larAliases' @::@ ['AliasListEntry']
+--
+-- * 'larNextMarker' @::@ 'Maybe' 'Text'
+--
+-- * 'larTruncated' @::@ 'Maybe' 'Bool'
+--
+listAliasesResponse :: ListAliasesResponse
+listAliasesResponse = ListAliasesResponse
+    { _larAliases    = mempty
+    , _larNextMarker = Nothing
+    , _larTruncated  = Nothing
+    }
+
+-- | A list of key aliases in the user's account.
+larAliases :: Lens' ListAliasesResponse [AliasListEntry]
+larAliases = lens _larAliases (\s a -> s { _larAliases = a }) . _List
+
+-- | If Truncated is true, this value is present and contains the value to use
+-- for the Marker request parameter in a subsequent pagination request.
+larNextMarker :: Lens' ListAliasesResponse (Maybe Text)
+larNextMarker = lens _larNextMarker (\s a -> s { _larNextMarker = a })
+
+-- | A flag that indicates whether there are more items in the list. If your
+-- results were truncated, you can make a subsequent pagination request
+-- using the Marker request parameter to retrieve more aliases in the list.
+larTruncated :: Lens' ListAliasesResponse (Maybe Bool)
+larTruncated = lens _larTruncated (\s a -> s { _larTruncated = a })
+
+instance ToPath ListAliases where
+    toPath = const "/"
+
+instance ToQuery ListAliases where
+    toQuery = const mempty
+
+instance ToHeaders ListAliases
+
+instance ToJSON ListAliases where
+    toJSON ListAliases{..} = object
+        [ "Limit"  .= _laLimit
+        , "Marker" .= _laMarker
+        ]
+
+instance AWSRequest ListAliases where
+    type Sv ListAliases = KMS
+    type Rs ListAliases = ListAliasesResponse
+
+    request  = post "ListAliases"
+    response = jsonResponse
+
+instance FromJSON ListAliasesResponse where
+    parseJSON = withObject "ListAliasesResponse" $ \o -> ListAliasesResponse
+        <$> o .:  "Aliases"
+        <*> o .:? "NextMarker"
+        <*> o .:? "Truncated"
diff --git a/gen/Network/AWS/KMS/ListGrants.hs b/gen/Network/AWS/KMS/ListGrants.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/ListGrants.hs
@@ -0,0 +1,158 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.ListGrants
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | List the grants for a specified key.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_ListGrants.html>
+module Network.AWS.KMS.ListGrants
+    (
+    -- * Request
+      ListGrants
+    -- ** Request constructor
+    , listGrants
+    -- ** Request lenses
+    , lgKeyId
+    , lgLimit
+    , lgMarker
+
+    -- * Response
+    , ListGrantsResponse
+    -- ** Response constructor
+    , listGrantsResponse
+    -- ** Response lenses
+    , lgrGrants
+    , lgrNextMarker
+    , lgrTruncated
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data ListGrants = ListGrants
+    { _lgKeyId  :: Text
+    , _lgLimit  :: Maybe Nat
+    , _lgMarker :: Maybe Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'ListGrants' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'lgKeyId' @::@ 'Text'
+--
+-- * 'lgLimit' @::@ 'Maybe' 'Natural'
+--
+-- * 'lgMarker' @::@ 'Maybe' 'Text'
+--
+listGrants :: Text -- ^ 'lgKeyId'
+           -> ListGrants
+listGrants p1 = ListGrants
+    { _lgKeyId  = p1
+    , _lgLimit  = Nothing
+    , _lgMarker = Nothing
+    }
+
+-- | Unique identifier of the key. This can be an ARN, an alias, or a globally
+-- unique identifier.
+lgKeyId :: Lens' ListGrants Text
+lgKeyId = lens _lgKeyId (\s a -> s { _lgKeyId = a })
+
+-- | Specify this parameter only when paginating results to indicate the
+-- maximum number of grants you want listed in the response. If there are
+-- additional grants beyond the maximum you specify, the Truncated response
+-- element will be set to true.
+lgLimit :: Lens' ListGrants (Maybe Natural)
+lgLimit = lens _lgLimit (\s a -> s { _lgLimit = a }) . mapping _Nat
+
+-- | Use this parameter only when paginating results, and only in a subsequent
+-- request after you've received a response where the results are truncated.
+-- Set it to the value of the NextMarker in the response you just received.
+lgMarker :: Lens' ListGrants (Maybe Text)
+lgMarker = lens _lgMarker (\s a -> s { _lgMarker = a })
+
+data ListGrantsResponse = ListGrantsResponse
+    { _lgrGrants     :: List "Grants" GrantListEntry
+    , _lgrNextMarker :: Maybe Text
+    , _lgrTruncated  :: Maybe Bool
+    } deriving (Eq, Show)
+
+-- | 'ListGrantsResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'lgrGrants' @::@ ['GrantListEntry']
+--
+-- * 'lgrNextMarker' @::@ 'Maybe' 'Text'
+--
+-- * 'lgrTruncated' @::@ 'Maybe' 'Bool'
+--
+listGrantsResponse :: ListGrantsResponse
+listGrantsResponse = ListGrantsResponse
+    { _lgrGrants     = mempty
+    , _lgrNextMarker = Nothing
+    , _lgrTruncated  = Nothing
+    }
+
+-- | A list of grants.
+lgrGrants :: Lens' ListGrantsResponse [GrantListEntry]
+lgrGrants = lens _lgrGrants (\s a -> s { _lgrGrants = a }) . _List
+
+-- | If Truncated is true, this value is present and contains the value to use
+-- for the Marker request parameter in a subsequent pagination request.
+lgrNextMarker :: Lens' ListGrantsResponse (Maybe Text)
+lgrNextMarker = lens _lgrNextMarker (\s a -> s { _lgrNextMarker = a })
+
+-- | A flag that indicates whether there are more items in the list. If your
+-- results were truncated, you can make a subsequent pagination request
+-- using the Marker request parameter to retrieve more grants in the list.
+lgrTruncated :: Lens' ListGrantsResponse (Maybe Bool)
+lgrTruncated = lens _lgrTruncated (\s a -> s { _lgrTruncated = a })
+
+instance ToPath ListGrants where
+    toPath = const "/"
+
+instance ToQuery ListGrants where
+    toQuery = const mempty
+
+instance ToHeaders ListGrants
+
+instance ToJSON ListGrants where
+    toJSON ListGrants{..} = object
+        [ "KeyId"  .= _lgKeyId
+        , "Limit"  .= _lgLimit
+        , "Marker" .= _lgMarker
+        ]
+
+instance AWSRequest ListGrants where
+    type Sv ListGrants = KMS
+    type Rs ListGrants = ListGrantsResponse
+
+    request  = post "ListGrants"
+    response = jsonResponse
+
+instance FromJSON ListGrantsResponse where
+    parseJSON = withObject "ListGrantsResponse" $ \o -> ListGrantsResponse
+        <$> o .:  "Grants"
+        <*> o .:? "NextMarker"
+        <*> o .:? "Truncated"
diff --git a/gen/Network/AWS/KMS/ListKeyPolicies.hs b/gen/Network/AWS/KMS/ListKeyPolicies.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/ListKeyPolicies.hs
@@ -0,0 +1,159 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.ListKeyPolicies
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Retrieves a list of policies attached to a key.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_ListKeyPolicies.html>
+module Network.AWS.KMS.ListKeyPolicies
+    (
+    -- * Request
+      ListKeyPolicies
+    -- ** Request constructor
+    , listKeyPolicies
+    -- ** Request lenses
+    , lkpKeyId
+    , lkpLimit
+    , lkpMarker
+
+    -- * Response
+    , ListKeyPoliciesResponse
+    -- ** Response constructor
+    , listKeyPoliciesResponse
+    -- ** Response lenses
+    , lkprNextMarker
+    , lkprPolicyNames
+    , lkprTruncated
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data ListKeyPolicies = ListKeyPolicies
+    { _lkpKeyId  :: Text
+    , _lkpLimit  :: Maybe Nat
+    , _lkpMarker :: Maybe Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'ListKeyPolicies' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'lkpKeyId' @::@ 'Text'
+--
+-- * 'lkpLimit' @::@ 'Maybe' 'Natural'
+--
+-- * 'lkpMarker' @::@ 'Maybe' 'Text'
+--
+listKeyPolicies :: Text -- ^ 'lkpKeyId'
+                -> ListKeyPolicies
+listKeyPolicies p1 = ListKeyPolicies
+    { _lkpKeyId  = p1
+    , _lkpLimit  = Nothing
+    , _lkpMarker = Nothing
+    }
+
+-- | Unique identifier of the key. This can be an ARN, an alias, or a globally
+-- unique identifier.
+lkpKeyId :: Lens' ListKeyPolicies Text
+lkpKeyId = lens _lkpKeyId (\s a -> s { _lkpKeyId = a })
+
+-- | Specify this parameter only when paginating results to indicate the
+-- maximum number of policies you want listed in the response. If there are
+-- additional policies beyond the maximum you specify, the Truncated
+-- response element will be set to true.
+lkpLimit :: Lens' ListKeyPolicies (Maybe Natural)
+lkpLimit = lens _lkpLimit (\s a -> s { _lkpLimit = a }) . mapping _Nat
+
+-- | Use this parameter only when paginating results, and only in a subsequent
+-- request after you've received a response where the results are truncated.
+-- Set it to the value of the NextMarker in the response you just received.
+lkpMarker :: Lens' ListKeyPolicies (Maybe Text)
+lkpMarker = lens _lkpMarker (\s a -> s { _lkpMarker = a })
+
+data ListKeyPoliciesResponse = ListKeyPoliciesResponse
+    { _lkprNextMarker  :: Maybe Text
+    , _lkprPolicyNames :: List "PolicyNames" Text
+    , _lkprTruncated   :: Maybe Bool
+    } deriving (Eq, Ord, Show)
+
+-- | 'ListKeyPoliciesResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'lkprNextMarker' @::@ 'Maybe' 'Text'
+--
+-- * 'lkprPolicyNames' @::@ ['Text']
+--
+-- * 'lkprTruncated' @::@ 'Maybe' 'Bool'
+--
+listKeyPoliciesResponse :: ListKeyPoliciesResponse
+listKeyPoliciesResponse = ListKeyPoliciesResponse
+    { _lkprPolicyNames = mempty
+    , _lkprNextMarker  = Nothing
+    , _lkprTruncated   = Nothing
+    }
+
+-- | If Truncated is true, this value is present and contains the value to use
+-- for the Marker request parameter in a subsequent pagination request.
+lkprNextMarker :: Lens' ListKeyPoliciesResponse (Maybe Text)
+lkprNextMarker = lens _lkprNextMarker (\s a -> s { _lkprNextMarker = a })
+
+-- | A list of policy names. Currently, there is only one policy and it is
+-- named "Default".
+lkprPolicyNames :: Lens' ListKeyPoliciesResponse [Text]
+lkprPolicyNames = lens _lkprPolicyNames (\s a -> s { _lkprPolicyNames = a }) . _List
+
+-- | A flag that indicates whether there are more items in the list. If your
+-- results were truncated, you can make a subsequent pagination request
+-- using the Marker request parameter to retrieve more policies in the list.
+lkprTruncated :: Lens' ListKeyPoliciesResponse (Maybe Bool)
+lkprTruncated = lens _lkprTruncated (\s a -> s { _lkprTruncated = a })
+
+instance ToPath ListKeyPolicies where
+    toPath = const "/"
+
+instance ToQuery ListKeyPolicies where
+    toQuery = const mempty
+
+instance ToHeaders ListKeyPolicies
+
+instance ToJSON ListKeyPolicies where
+    toJSON ListKeyPolicies{..} = object
+        [ "KeyId"  .= _lkpKeyId
+        , "Limit"  .= _lkpLimit
+        , "Marker" .= _lkpMarker
+        ]
+
+instance AWSRequest ListKeyPolicies where
+    type Sv ListKeyPolicies = KMS
+    type Rs ListKeyPolicies = ListKeyPoliciesResponse
+
+    request  = post "ListKeyPolicies"
+    response = jsonResponse
+
+instance FromJSON ListKeyPoliciesResponse where
+    parseJSON = withObject "ListKeyPoliciesResponse" $ \o -> ListKeyPoliciesResponse
+        <$> o .:? "NextMarker"
+        <*> o .:  "PolicyNames"
+        <*> o .:? "Truncated"
diff --git a/gen/Network/AWS/KMS/ListKeys.hs b/gen/Network/AWS/KMS/ListKeys.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/ListKeys.hs
@@ -0,0 +1,146 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.ListKeys
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Lists the customer master keys.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_ListKeys.html>
+module Network.AWS.KMS.ListKeys
+    (
+    -- * Request
+      ListKeys
+    -- ** Request constructor
+    , listKeys
+    -- ** Request lenses
+    , lkLimit
+    , lkMarker
+
+    -- * Response
+    , ListKeysResponse
+    -- ** Response constructor
+    , listKeysResponse
+    -- ** Response lenses
+    , lkrKeys
+    , lkrNextMarker
+    , lkrTruncated
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data ListKeys = ListKeys
+    { _lkLimit  :: Maybe Nat
+    , _lkMarker :: Maybe Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'ListKeys' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'lkLimit' @::@ 'Maybe' 'Natural'
+--
+-- * 'lkMarker' @::@ 'Maybe' 'Text'
+--
+listKeys :: ListKeys
+listKeys = ListKeys
+    { _lkLimit  = Nothing
+    , _lkMarker = Nothing
+    }
+
+-- | Specify this parameter only when paginating results to indicate the
+-- maximum number of keys you want listed in the response. If there are
+-- additional keys beyond the maximum you specify, the Truncated response
+-- element will be set to true.
+lkLimit :: Lens' ListKeys (Maybe Natural)
+lkLimit = lens _lkLimit (\s a -> s { _lkLimit = a }) . mapping _Nat
+
+-- | Use this parameter only when paginating results, and only in a subsequent
+-- request after you've received a response where the results are truncated.
+-- Set it to the value of the NextMarker in the response you just received.
+lkMarker :: Lens' ListKeys (Maybe Text)
+lkMarker = lens _lkMarker (\s a -> s { _lkMarker = a })
+
+data ListKeysResponse = ListKeysResponse
+    { _lkrKeys       :: List "Keys" KeyListEntry
+    , _lkrNextMarker :: Maybe Text
+    , _lkrTruncated  :: Maybe Bool
+    } deriving (Eq, Show)
+
+-- | 'ListKeysResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'lkrKeys' @::@ ['KeyListEntry']
+--
+-- * 'lkrNextMarker' @::@ 'Maybe' 'Text'
+--
+-- * 'lkrTruncated' @::@ 'Maybe' 'Bool'
+--
+listKeysResponse :: ListKeysResponse
+listKeysResponse = ListKeysResponse
+    { _lkrKeys       = mempty
+    , _lkrNextMarker = Nothing
+    , _lkrTruncated  = Nothing
+    }
+
+-- | A list of keys.
+lkrKeys :: Lens' ListKeysResponse [KeyListEntry]
+lkrKeys = lens _lkrKeys (\s a -> s { _lkrKeys = a }) . _List
+
+-- | If Truncated is true, this value is present and contains the value to use
+-- for the Marker request parameter in a subsequent pagination request.
+lkrNextMarker :: Lens' ListKeysResponse (Maybe Text)
+lkrNextMarker = lens _lkrNextMarker (\s a -> s { _lkrNextMarker = a })
+
+-- | A flag that indicates whether there are more items in the list. If your
+-- results were truncated, you can make a subsequent pagination request
+-- using the Marker request parameter to retrieve more keys in the list.
+lkrTruncated :: Lens' ListKeysResponse (Maybe Bool)
+lkrTruncated = lens _lkrTruncated (\s a -> s { _lkrTruncated = a })
+
+instance ToPath ListKeys where
+    toPath = const "/"
+
+instance ToQuery ListKeys where
+    toQuery = const mempty
+
+instance ToHeaders ListKeys
+
+instance ToJSON ListKeys where
+    toJSON ListKeys{..} = object
+        [ "Limit"  .= _lkLimit
+        , "Marker" .= _lkMarker
+        ]
+
+instance AWSRequest ListKeys where
+    type Sv ListKeys = KMS
+    type Rs ListKeys = ListKeysResponse
+
+    request  = post "ListKeys"
+    response = jsonResponse
+
+instance FromJSON ListKeysResponse where
+    parseJSON = withObject "ListKeysResponse" $ \o -> ListKeysResponse
+        <$> o .:  "Keys"
+        <*> o .:? "NextMarker"
+        <*> o .:? "Truncated"
diff --git a/gen/Network/AWS/KMS/PutKeyPolicy.hs b/gen/Network/AWS/KMS/PutKeyPolicy.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/PutKeyPolicy.hs
@@ -0,0 +1,115 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.PutKeyPolicy
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Attaches a policy to the specified key.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_PutKeyPolicy.html>
+module Network.AWS.KMS.PutKeyPolicy
+    (
+    -- * Request
+      PutKeyPolicy
+    -- ** Request constructor
+    , putKeyPolicy
+    -- ** Request lenses
+    , pkpKeyId
+    , pkpPolicy
+    , pkpPolicyName
+
+    -- * Response
+    , PutKeyPolicyResponse
+    -- ** Response constructor
+    , putKeyPolicyResponse
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data PutKeyPolicy = PutKeyPolicy
+    { _pkpKeyId      :: Text
+    , _pkpPolicy     :: Text
+    , _pkpPolicyName :: Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'PutKeyPolicy' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'pkpKeyId' @::@ 'Text'
+--
+-- * 'pkpPolicy' @::@ 'Text'
+--
+-- * 'pkpPolicyName' @::@ 'Text'
+--
+putKeyPolicy :: Text -- ^ 'pkpKeyId'
+             -> Text -- ^ 'pkpPolicyName'
+             -> Text -- ^ 'pkpPolicy'
+             -> PutKeyPolicy
+putKeyPolicy p1 p2 p3 = PutKeyPolicy
+    { _pkpKeyId      = p1
+    , _pkpPolicyName = p2
+    , _pkpPolicy     = p3
+    }
+
+-- | Unique identifier of the key. This can be an ARN, an alias, or a globally
+-- unique identifier.
+pkpKeyId :: Lens' PutKeyPolicy Text
+pkpKeyId = lens _pkpKeyId (\s a -> s { _pkpKeyId = a })
+
+-- | The policy, in JSON format, to be attached to the key.
+pkpPolicy :: Lens' PutKeyPolicy Text
+pkpPolicy = lens _pkpPolicy (\s a -> s { _pkpPolicy = a })
+
+-- | Name of the policy to be attached. Currently, the only supported name is
+-- "default".
+pkpPolicyName :: Lens' PutKeyPolicy Text
+pkpPolicyName = lens _pkpPolicyName (\s a -> s { _pkpPolicyName = a })
+
+data PutKeyPolicyResponse = PutKeyPolicyResponse
+    deriving (Eq, Ord, Show, Generic)
+
+-- | 'PutKeyPolicyResponse' constructor.
+putKeyPolicyResponse :: PutKeyPolicyResponse
+putKeyPolicyResponse = PutKeyPolicyResponse
+
+instance ToPath PutKeyPolicy where
+    toPath = const "/"
+
+instance ToQuery PutKeyPolicy where
+    toQuery = const mempty
+
+instance ToHeaders PutKeyPolicy
+
+instance ToJSON PutKeyPolicy where
+    toJSON PutKeyPolicy{..} = object
+        [ "KeyId"      .= _pkpKeyId
+        , "PolicyName" .= _pkpPolicyName
+        , "Policy"     .= _pkpPolicy
+        ]
+
+instance AWSRequest PutKeyPolicy where
+    type Sv PutKeyPolicy = KMS
+    type Rs PutKeyPolicy = PutKeyPolicyResponse
+
+    request  = post "PutKeyPolicy"
+    response = nullResponse PutKeyPolicyResponse
diff --git a/gen/Network/AWS/KMS/ReEncrypt.hs b/gen/Network/AWS/KMS/ReEncrypt.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/ReEncrypt.hs
@@ -0,0 +1,183 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.ReEncrypt
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Encrypts data on the server side with a new customer master key without
+-- exposing the plaintext of the data on the client side. The data is first
+-- decrypted and then encrypted. This operation can also be used to change the
+-- encryption context of a ciphertext.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_ReEncrypt.html>
+module Network.AWS.KMS.ReEncrypt
+    (
+    -- * Request
+      ReEncrypt
+    -- ** Request constructor
+    , reEncrypt
+    -- ** Request lenses
+    , reCiphertextBlob
+    , reDestinationEncryptionContext
+    , reDestinationKeyId
+    , reGrantTokens
+    , reSourceEncryptionContext
+
+    -- * Response
+    , ReEncryptResponse
+    -- ** Response constructor
+    , reEncryptResponse
+    -- ** Response lenses
+    , rerCiphertextBlob
+    , rerKeyId
+    , rerSourceKeyId
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data ReEncrypt = ReEncrypt
+    { _reCiphertextBlob               :: Base64
+    , _reDestinationEncryptionContext :: Map Text Text
+    , _reDestinationKeyId             :: Text
+    , _reGrantTokens                  :: List "GrantTokens" Text
+    , _reSourceEncryptionContext      :: Map Text Text
+    } deriving (Eq, Show)
+
+-- | 'ReEncrypt' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'reCiphertextBlob' @::@ 'Base64'
+--
+-- * 'reDestinationEncryptionContext' @::@ 'HashMap' 'Text' 'Text'
+--
+-- * 'reDestinationKeyId' @::@ 'Text'
+--
+-- * 'reGrantTokens' @::@ ['Text']
+--
+-- * 'reSourceEncryptionContext' @::@ 'HashMap' 'Text' 'Text'
+--
+reEncrypt :: Base64 -- ^ 'reCiphertextBlob'
+          -> Text -- ^ 'reDestinationKeyId'
+          -> ReEncrypt
+reEncrypt p1 p2 = ReEncrypt
+    { _reCiphertextBlob               = p1
+    , _reDestinationKeyId             = p2
+    , _reSourceEncryptionContext      = mempty
+    , _reDestinationEncryptionContext = mempty
+    , _reGrantTokens                  = mempty
+    }
+
+-- | Ciphertext of the data to re-encrypt.
+reCiphertextBlob :: Lens' ReEncrypt Base64
+reCiphertextBlob = lens _reCiphertextBlob (\s a -> s { _reCiphertextBlob = a })
+
+-- | Encryption context to be used when the data is re-encrypted.
+reDestinationEncryptionContext :: Lens' ReEncrypt (HashMap Text Text)
+reDestinationEncryptionContext =
+    lens _reDestinationEncryptionContext
+        (\s a -> s { _reDestinationEncryptionContext = a })
+            . _Map
+
+-- | Key identifier of the key used to re-encrypt the data.
+reDestinationKeyId :: Lens' ReEncrypt Text
+reDestinationKeyId =
+    lens _reDestinationKeyId (\s a -> s { _reDestinationKeyId = a })
+
+-- | Grant tokens that identify the grants that have permissions for the
+-- encryption and decryption process.
+reGrantTokens :: Lens' ReEncrypt [Text]
+reGrantTokens = lens _reGrantTokens (\s a -> s { _reGrantTokens = a }) . _List
+
+-- | Encryption context used to encrypt and decrypt the data specified in the
+-- CiphertextBlob parameter.
+reSourceEncryptionContext :: Lens' ReEncrypt (HashMap Text Text)
+reSourceEncryptionContext =
+    lens _reSourceEncryptionContext
+        (\s a -> s { _reSourceEncryptionContext = a })
+            . _Map
+
+data ReEncryptResponse = ReEncryptResponse
+    { _rerCiphertextBlob :: Maybe Base64
+    , _rerKeyId          :: Maybe Text
+    , _rerSourceKeyId    :: Maybe Text
+    } deriving (Eq, Show)
+
+-- | 'ReEncryptResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'rerCiphertextBlob' @::@ 'Maybe' 'Base64'
+--
+-- * 'rerKeyId' @::@ 'Maybe' 'Text'
+--
+-- * 'rerSourceKeyId' @::@ 'Maybe' 'Text'
+--
+reEncryptResponse :: ReEncryptResponse
+reEncryptResponse = ReEncryptResponse
+    { _rerCiphertextBlob = Nothing
+    , _rerSourceKeyId    = Nothing
+    , _rerKeyId          = Nothing
+    }
+
+-- | The re-encrypted data.
+rerCiphertextBlob :: Lens' ReEncryptResponse (Maybe Base64)
+rerCiphertextBlob =
+    lens _rerCiphertextBlob (\s a -> s { _rerCiphertextBlob = a })
+
+-- | Unique identifier of the key used to re-encrypt the data.
+rerKeyId :: Lens' ReEncryptResponse (Maybe Text)
+rerKeyId = lens _rerKeyId (\s a -> s { _rerKeyId = a })
+
+-- | Unique identifier of the key used to originally encrypt the data.
+rerSourceKeyId :: Lens' ReEncryptResponse (Maybe Text)
+rerSourceKeyId = lens _rerSourceKeyId (\s a -> s { _rerSourceKeyId = a })
+
+instance ToPath ReEncrypt where
+    toPath = const "/"
+
+instance ToQuery ReEncrypt where
+    toQuery = const mempty
+
+instance ToHeaders ReEncrypt
+
+instance ToJSON ReEncrypt where
+    toJSON ReEncrypt{..} = object
+        [ "CiphertextBlob"               .= _reCiphertextBlob
+        , "SourceEncryptionContext"      .= _reSourceEncryptionContext
+        , "DestinationKeyId"             .= _reDestinationKeyId
+        , "DestinationEncryptionContext" .= _reDestinationEncryptionContext
+        , "GrantTokens"                  .= _reGrantTokens
+        ]
+
+instance AWSRequest ReEncrypt where
+    type Sv ReEncrypt = KMS
+    type Rs ReEncrypt = ReEncryptResponse
+
+    request  = post "ReEncrypt"
+    response = jsonResponse
+
+instance FromJSON ReEncryptResponse where
+    parseJSON = withObject "ReEncryptResponse" $ \o -> ReEncryptResponse
+        <$> o .:? "CiphertextBlob"
+        <*> o .:? "KeyId"
+        <*> o .:? "SourceKeyId"
diff --git a/gen/Network/AWS/KMS/RetireGrant.hs b/gen/Network/AWS/KMS/RetireGrant.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/RetireGrant.hs
@@ -0,0 +1,93 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.RetireGrant
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Retires a grant. You can retire a grant when you're done using it to clean
+-- up. You should revoke a grant when you intend to actively deny operations
+-- that depend on it.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_RetireGrant.html>
+module Network.AWS.KMS.RetireGrant
+    (
+    -- * Request
+      RetireGrant
+    -- ** Request constructor
+    , retireGrant
+    -- ** Request lenses
+    , rgGrantToken
+
+    -- * Response
+    , RetireGrantResponse
+    -- ** Response constructor
+    , retireGrantResponse
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+newtype RetireGrant = RetireGrant
+    { _rgGrantToken :: Text
+    } deriving (Eq, Ord, Show, Monoid, IsString)
+
+-- | 'RetireGrant' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'rgGrantToken' @::@ 'Text'
+--
+retireGrant :: Text -- ^ 'rgGrantToken'
+            -> RetireGrant
+retireGrant p1 = RetireGrant
+    { _rgGrantToken = p1
+    }
+
+-- | Token that identifies the grant to be retired.
+rgGrantToken :: Lens' RetireGrant Text
+rgGrantToken = lens _rgGrantToken (\s a -> s { _rgGrantToken = a })
+
+data RetireGrantResponse = RetireGrantResponse
+    deriving (Eq, Ord, Show, Generic)
+
+-- | 'RetireGrantResponse' constructor.
+retireGrantResponse :: RetireGrantResponse
+retireGrantResponse = RetireGrantResponse
+
+instance ToPath RetireGrant where
+    toPath = const "/"
+
+instance ToQuery RetireGrant where
+    toQuery = const mempty
+
+instance ToHeaders RetireGrant
+
+instance ToJSON RetireGrant where
+    toJSON RetireGrant{..} = object
+        [ "GrantToken" .= _rgGrantToken
+        ]
+
+instance AWSRequest RetireGrant where
+    type Sv RetireGrant = KMS
+    type Rs RetireGrant = RetireGrantResponse
+
+    request  = post "RetireGrant"
+    response = nullResponse RetireGrantResponse
diff --git a/gen/Network/AWS/KMS/RevokeGrant.hs b/gen/Network/AWS/KMS/RevokeGrant.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/RevokeGrant.hs
@@ -0,0 +1,103 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.RevokeGrant
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | Revokes a grant. You can revoke a grant to actively deny operations that
+-- depend on it.
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_RevokeGrant.html>
+module Network.AWS.KMS.RevokeGrant
+    (
+    -- * Request
+      RevokeGrant
+    -- ** Request constructor
+    , revokeGrant
+    -- ** Request lenses
+    , rgGrantId
+    , rgKeyId
+
+    -- * Response
+    , RevokeGrantResponse
+    -- ** Response constructor
+    , revokeGrantResponse
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data RevokeGrant = RevokeGrant
+    { _rgGrantId :: Text
+    , _rgKeyId   :: Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'RevokeGrant' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'rgGrantId' @::@ 'Text'
+--
+-- * 'rgKeyId' @::@ 'Text'
+--
+revokeGrant :: Text -- ^ 'rgKeyId'
+            -> Text -- ^ 'rgGrantId'
+            -> RevokeGrant
+revokeGrant p1 p2 = RevokeGrant
+    { _rgKeyId   = p1
+    , _rgGrantId = p2
+    }
+
+-- | Identifier of the grant to be revoked.
+rgGrantId :: Lens' RevokeGrant Text
+rgGrantId = lens _rgGrantId (\s a -> s { _rgGrantId = a })
+
+-- | Unique identifier of the key associated with the grant.
+rgKeyId :: Lens' RevokeGrant Text
+rgKeyId = lens _rgKeyId (\s a -> s { _rgKeyId = a })
+
+data RevokeGrantResponse = RevokeGrantResponse
+    deriving (Eq, Ord, Show, Generic)
+
+-- | 'RevokeGrantResponse' constructor.
+revokeGrantResponse :: RevokeGrantResponse
+revokeGrantResponse = RevokeGrantResponse
+
+instance ToPath RevokeGrant where
+    toPath = const "/"
+
+instance ToQuery RevokeGrant where
+    toQuery = const mempty
+
+instance ToHeaders RevokeGrant
+
+instance ToJSON RevokeGrant where
+    toJSON RevokeGrant{..} = object
+        [ "KeyId"   .= _rgKeyId
+        , "GrantId" .= _rgGrantId
+        ]
+
+instance AWSRequest RevokeGrant where
+    type Sv RevokeGrant = KMS
+    type Rs RevokeGrant = RevokeGrantResponse
+
+    request  = post "RevokeGrant"
+    response = nullResponse RevokeGrantResponse
diff --git a/gen/Network/AWS/KMS/Types.hs b/gen/Network/AWS/KMS/Types.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/Types.hs
@@ -0,0 +1,486 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.Types
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+module Network.AWS.KMS.Types
+    (
+    -- * Service
+      KMS
+    -- ** Error
+    , JSONError
+
+    -- * KeyUsageType
+    , KeyUsageType (..)
+
+    -- * KeyMetadata
+    , KeyMetadata
+    , keyMetadata
+    , kmAWSAccountId
+    , kmArn
+    , kmCreationDate
+    , kmDescription
+    , kmEnabled
+    , kmKeyId
+    , kmKeyUsage
+
+    -- * DataKeySpec
+    , DataKeySpec (..)
+
+    -- * GrantConstraints
+    , GrantConstraints
+    , grantConstraints
+    , gcEncryptionContextEquals
+    , gcEncryptionContextSubset
+
+    -- * AliasListEntry
+    , AliasListEntry
+    , aliasListEntry
+    , aleAliasArn
+    , aleAliasName
+    , aleTargetKeyId
+
+    -- * GrantListEntry
+    , GrantListEntry
+    , grantListEntry
+    , gleConstraints
+    , gleGrantId
+    , gleGranteePrincipal
+    , gleIssuingAccount
+    , gleOperations
+    , gleRetiringPrincipal
+
+    -- * GrantOperation
+    , GrantOperation (..)
+
+    -- * KeyListEntry
+    , KeyListEntry
+    , keyListEntry
+    , kleKeyArn
+    , kleKeyId
+    ) where
+
+import Data.Char (isUpper)
+import Network.AWS.Error
+import Network.AWS.Prelude
+import Network.AWS.Signing.V4
+import qualified GHC.Exts
+
+-- | Version @2014-11-01@ of the Amazon Key Management Service service.
+data KMS
+
+instance AWSService KMS where
+    type Sg KMS = V4
+    type Er KMS = JSONError
+
+    service = Service
+        { _svcEndpoint     = regional
+        , _svcAbbrev       = "KMS"
+        , _svcPrefix       = "kms"
+        , _svcVersion      = "2014-11-01"
+        , _svcTargetPrefix = Just "TrentService"
+        , _svcJSONVersion  = Just "1.1"
+        }
+
+    handle = jsonError statusSuccess
+
+data KeyUsageType
+    = EncryptDecrypt -- ^ ENCRYPT_DECRYPT
+      deriving (Eq, Ord, Show, Generic, Enum)
+
+instance Hashable KeyUsageType
+
+instance FromText KeyUsageType where
+    parser = match "ENCRYPT_DECRYPT" EncryptDecrypt
+
+instance ToText KeyUsageType where
+    toText EncryptDecrypt = "ENCRYPT_DECRYPT"
+
+instance FromJSON KeyUsageType where
+    parseJSON = parseJSONText "KeyUsageType"
+
+instance ToJSON KeyUsageType where
+    toJSON = toJSONText
+
+data KeyMetadata = KeyMetadata
+    { _kmAWSAccountId :: Maybe Text
+    , _kmArn          :: Maybe Text
+    , _kmCreationDate :: Maybe RFC822
+    , _kmDescription  :: Maybe Text
+    , _kmEnabled      :: Maybe Bool
+    , _kmKeyId        :: Text
+    , _kmKeyUsage     :: Maybe Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'KeyMetadata' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'kmAWSAccountId' @::@ 'Maybe' 'Text'
+--
+-- * 'kmArn' @::@ 'Maybe' 'Text'
+--
+-- * 'kmCreationDate' @::@ 'Maybe' 'UTCTime'
+--
+-- * 'kmDescription' @::@ 'Maybe' 'Text'
+--
+-- * 'kmEnabled' @::@ 'Maybe' 'Bool'
+--
+-- * 'kmKeyId' @::@ 'Text'
+--
+-- * 'kmKeyUsage' @::@ 'Maybe' 'Text'
+--
+keyMetadata :: Text -- ^ 'kmKeyId'
+            -> KeyMetadata
+keyMetadata p1 = KeyMetadata
+    { _kmKeyId        = p1
+    , _kmAWSAccountId = Nothing
+    , _kmArn          = Nothing
+    , _kmCreationDate = Nothing
+    , _kmEnabled      = Nothing
+    , _kmDescription  = Nothing
+    , _kmKeyUsage     = Nothing
+    }
+
+-- | Account ID number.
+kmAWSAccountId :: Lens' KeyMetadata (Maybe Text)
+kmAWSAccountId = lens _kmAWSAccountId (\s a -> s { _kmAWSAccountId = a })
+
+-- | Key ARN (Amazon Resource Name).
+kmArn :: Lens' KeyMetadata (Maybe Text)
+kmArn = lens _kmArn (\s a -> s { _kmArn = a })
+
+-- | Date the key was created.
+kmCreationDate :: Lens' KeyMetadata (Maybe UTCTime)
+kmCreationDate = lens _kmCreationDate (\s a -> s { _kmCreationDate = a }) . mapping _Time
+
+-- | The description of the key.
+kmDescription :: Lens' KeyMetadata (Maybe Text)
+kmDescription = lens _kmDescription (\s a -> s { _kmDescription = a })
+
+-- | Value that specifies whether the key is enabled.
+kmEnabled :: Lens' KeyMetadata (Maybe Bool)
+kmEnabled = lens _kmEnabled (\s a -> s { _kmEnabled = a })
+
+-- | Unique identifier for the key.
+kmKeyId :: Lens' KeyMetadata Text
+kmKeyId = lens _kmKeyId (\s a -> s { _kmKeyId = a })
+
+-- | A value that specifies what operation(s) the key can perform.
+kmKeyUsage :: Lens' KeyMetadata (Maybe Text)
+kmKeyUsage = lens _kmKeyUsage (\s a -> s { _kmKeyUsage = a })
+
+instance FromJSON KeyMetadata where
+    parseJSON = withObject "KeyMetadata" $ \o -> KeyMetadata
+        <$> o .:? "AWSAccountId"
+        <*> o .:? "Arn"
+        <*> o .:? "CreationDate"
+        <*> o .:? "Description"
+        <*> o .:? "Enabled"
+        <*> o .:  "KeyId"
+        <*> o .:? "KeyUsage"
+
+instance ToJSON KeyMetadata where
+    toJSON KeyMetadata{..} = object
+        [ "AWSAccountId" .= _kmAWSAccountId
+        , "KeyId"        .= _kmKeyId
+        , "Arn"          .= _kmArn
+        , "CreationDate" .= _kmCreationDate
+        , "Enabled"      .= _kmEnabled
+        , "Description"  .= _kmDescription
+        , "KeyUsage"     .= _kmKeyUsage
+        ]
+
+data DataKeySpec
+    = AES128 -- ^ AES_128
+    | AES256 -- ^ AES_256
+      deriving (Eq, Ord, Show, Generic, Enum)
+
+instance Hashable DataKeySpec
+
+instance FromText DataKeySpec where
+    parser = match "AES_128" AES128
+         <|> match "AES_256" AES256
+
+instance ToText DataKeySpec where
+    toText = \case
+        AES128 -> "AES_128"
+        AES256 -> "AES_256"
+
+instance FromJSON DataKeySpec where
+    parseJSON = parseJSONText "DataKeySpec"
+
+instance ToJSON DataKeySpec where
+    toJSON = toJSONText
+
+data GrantConstraints = GrantConstraints
+    { _gcEncryptionContextEquals :: Map Text Text
+    , _gcEncryptionContextSubset :: Map Text Text
+    } deriving (Eq, Show)
+
+-- | 'GrantConstraints' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'gcEncryptionContextEquals' @::@ 'HashMap' 'Text' 'Text'
+--
+-- * 'gcEncryptionContextSubset' @::@ 'HashMap' 'Text' 'Text'
+--
+grantConstraints :: GrantConstraints
+grantConstraints = GrantConstraints
+    { _gcEncryptionContextSubset = mempty
+    , _gcEncryptionContextEquals = mempty
+    }
+
+-- | The constraint contains additional key/value pairs that serve to further
+-- limit the grant.
+gcEncryptionContextEquals :: Lens' GrantConstraints (HashMap Text Text)
+gcEncryptionContextEquals =
+    lens _gcEncryptionContextEquals
+        (\s a -> s { _gcEncryptionContextEquals = a })
+            . _Map
+
+-- | The constraint equals the full encryption context.
+gcEncryptionContextSubset :: Lens' GrantConstraints (HashMap Text Text)
+gcEncryptionContextSubset =
+    lens _gcEncryptionContextSubset
+        (\s a -> s { _gcEncryptionContextSubset = a })
+            . _Map
+
+instance FromJSON GrantConstraints where
+    parseJSON = withObject "GrantConstraints" $ \o -> GrantConstraints
+        <$> o .:  "EncryptionContextEquals"
+        <*> o .:  "EncryptionContextSubset"
+
+instance ToJSON GrantConstraints where
+    toJSON GrantConstraints{..} = object
+        [ "EncryptionContextSubset" .= _gcEncryptionContextSubset
+        , "EncryptionContextEquals" .= _gcEncryptionContextEquals
+        ]
+
+data AliasListEntry = AliasListEntry
+    { _aleAliasArn    :: Maybe Text
+    , _aleAliasName   :: Maybe Text
+    , _aleTargetKeyId :: Maybe Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'AliasListEntry' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'aleAliasArn' @::@ 'Maybe' 'Text'
+--
+-- * 'aleAliasName' @::@ 'Maybe' 'Text'
+--
+-- * 'aleTargetKeyId' @::@ 'Maybe' 'Text'
+--
+aliasListEntry :: AliasListEntry
+aliasListEntry = AliasListEntry
+    { _aleAliasName   = Nothing
+    , _aleAliasArn    = Nothing
+    , _aleTargetKeyId = Nothing
+    }
+
+-- | String that contains the key ARN.
+aleAliasArn :: Lens' AliasListEntry (Maybe Text)
+aleAliasArn = lens _aleAliasArn (\s a -> s { _aleAliasArn = a })
+
+-- | String that contains the alias.
+aleAliasName :: Lens' AliasListEntry (Maybe Text)
+aleAliasName = lens _aleAliasName (\s a -> s { _aleAliasName = a })
+
+-- | String that contains the key identifier pointed to by the alias.
+aleTargetKeyId :: Lens' AliasListEntry (Maybe Text)
+aleTargetKeyId = lens _aleTargetKeyId (\s a -> s { _aleTargetKeyId = a })
+
+instance FromJSON AliasListEntry where
+    parseJSON = withObject "AliasListEntry" $ \o -> AliasListEntry
+        <$> o .:? "AliasArn"
+        <*> o .:? "AliasName"
+        <*> o .:? "TargetKeyId"
+
+instance ToJSON AliasListEntry where
+    toJSON AliasListEntry{..} = object
+        [ "AliasName"   .= _aleAliasName
+        , "AliasArn"    .= _aleAliasArn
+        , "TargetKeyId" .= _aleTargetKeyId
+        ]
+
+data GrantListEntry = GrantListEntry
+    { _gleConstraints       :: Maybe GrantConstraints
+    , _gleGrantId           :: Maybe Text
+    , _gleGranteePrincipal  :: Maybe Text
+    , _gleIssuingAccount    :: Maybe Text
+    , _gleOperations        :: List "Operations" Text
+    , _gleRetiringPrincipal :: Maybe Text
+    } deriving (Eq, Show)
+
+-- | 'GrantListEntry' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'gleConstraints' @::@ 'Maybe' 'GrantConstraints'
+--
+-- * 'gleGrantId' @::@ 'Maybe' 'Text'
+--
+-- * 'gleGranteePrincipal' @::@ 'Maybe' 'Text'
+--
+-- * 'gleIssuingAccount' @::@ 'Maybe' 'Text'
+--
+-- * 'gleOperations' @::@ ['Text']
+--
+-- * 'gleRetiringPrincipal' @::@ 'Maybe' 'Text'
+--
+grantListEntry :: GrantListEntry
+grantListEntry = GrantListEntry
+    { _gleGrantId           = Nothing
+    , _gleGranteePrincipal  = Nothing
+    , _gleRetiringPrincipal = Nothing
+    , _gleIssuingAccount    = Nothing
+    , _gleOperations        = mempty
+    , _gleConstraints       = Nothing
+    }
+
+-- | Specifies the conditions under which the actions specified by the
+-- Operations parameter are allowed.
+gleConstraints :: Lens' GrantListEntry (Maybe GrantConstraints)
+gleConstraints = lens _gleConstraints (\s a -> s { _gleConstraints = a })
+
+-- | Unique grant identifier.
+gleGrantId :: Lens' GrantListEntry (Maybe Text)
+gleGrantId = lens _gleGrantId (\s a -> s { _gleGrantId = a })
+
+-- | The principal that receives the grant permission.
+gleGranteePrincipal :: Lens' GrantListEntry (Maybe Text)
+gleGranteePrincipal =
+    lens _gleGranteePrincipal (\s a -> s { _gleGranteePrincipal = a })
+
+-- | The account under which the grant was issued.
+gleIssuingAccount :: Lens' GrantListEntry (Maybe Text)
+gleIssuingAccount =
+    lens _gleIssuingAccount (\s a -> s { _gleIssuingAccount = a })
+
+-- | List of operations permitted by the grant. This can be any combination of
+-- one or more of the following values: Decrypt Encrypt GenerateDataKey
+-- GenerateDataKeyWithoutPlaintext ReEncryptFrom ReEncryptTo CreateGrant.
+gleOperations :: Lens' GrantListEntry [Text]
+gleOperations = lens _gleOperations (\s a -> s { _gleOperations = a }) . _List
+
+-- | The principal that can retire the account.
+gleRetiringPrincipal :: Lens' GrantListEntry (Maybe Text)
+gleRetiringPrincipal =
+    lens _gleRetiringPrincipal (\s a -> s { _gleRetiringPrincipal = a })
+
+instance FromJSON GrantListEntry where
+    parseJSON = withObject "GrantListEntry" $ \o -> GrantListEntry
+        <$> o .:? "Constraints"
+        <*> o .:? "GrantId"
+        <*> o .:? "GranteePrincipal"
+        <*> o .:? "IssuingAccount"
+        <*> o .:  "Operations"
+        <*> o .:? "RetiringPrincipal"
+
+instance ToJSON GrantListEntry where
+    toJSON GrantListEntry{..} = object
+        [ "GrantId"           .= _gleGrantId
+        , "GranteePrincipal"  .= _gleGranteePrincipal
+        , "RetiringPrincipal" .= _gleRetiringPrincipal
+        , "IssuingAccount"    .= _gleIssuingAccount
+        , "Operations"        .= _gleOperations
+        , "Constraints"       .= _gleConstraints
+        ]
+
+data GrantOperation
+    = GOCreateGrant                     -- ^ CreateGrant
+    | GODecrypt                         -- ^ Decrypt
+    | GOEncrypt                         -- ^ Encrypt
+    | GOGenerateDataKey                 -- ^ GenerateDataKey
+    | GOGenerateDataKeyWithoutPlaintext -- ^ GenerateDataKeyWithoutPlaintext
+    | GOReEncryptFrom                   -- ^ ReEncryptFrom
+    | GOReEncryptTo                     -- ^ ReEncryptTo
+    | GORetireGrant                     -- ^ RetireGrant
+      deriving (Eq, Ord, Show, Generic, Enum)
+
+instance Hashable GrantOperation
+
+instance FromText GrantOperation where
+    parser = match "CreateGrant"                     GOCreateGrant
+         <|> match "Decrypt"                         GODecrypt
+         <|> match "Encrypt"                         GOEncrypt
+         <|> match "GenerateDataKey"                 GOGenerateDataKey
+         <|> match "GenerateDataKeyWithoutPlaintext" GOGenerateDataKeyWithoutPlaintext
+         <|> match "ReEncryptFrom"                   GOReEncryptFrom
+         <|> match "ReEncryptTo"                     GOReEncryptTo
+         <|> match "RetireGrant"                     GORetireGrant
+
+instance ToText GrantOperation where
+    toText = \case
+        GOCreateGrant                     -> "CreateGrant"
+        GODecrypt                         -> "Decrypt"
+        GOEncrypt                         -> "Encrypt"
+        GOGenerateDataKey                 -> "GenerateDataKey"
+        GOGenerateDataKeyWithoutPlaintext -> "GenerateDataKeyWithoutPlaintext"
+        GOReEncryptFrom                   -> "ReEncryptFrom"
+        GOReEncryptTo                     -> "ReEncryptTo"
+        GORetireGrant                     -> "RetireGrant"
+
+instance FromJSON GrantOperation where
+    parseJSON = parseJSONText "GrantOperation"
+
+instance ToJSON GrantOperation where
+    toJSON = toJSONText
+
+data KeyListEntry = KeyListEntry
+    { _kleKeyArn :: Maybe Text
+    , _kleKeyId  :: Maybe Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'KeyListEntry' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'kleKeyArn' @::@ 'Maybe' 'Text'
+--
+-- * 'kleKeyId' @::@ 'Maybe' 'Text'
+--
+keyListEntry :: KeyListEntry
+keyListEntry = KeyListEntry
+    { _kleKeyId  = Nothing
+    , _kleKeyArn = Nothing
+    }
+
+-- | ARN of the key.
+kleKeyArn :: Lens' KeyListEntry (Maybe Text)
+kleKeyArn = lens _kleKeyArn (\s a -> s { _kleKeyArn = a })
+
+-- | Unique identifier of the key.
+kleKeyId :: Lens' KeyListEntry (Maybe Text)
+kleKeyId = lens _kleKeyId (\s a -> s { _kleKeyId = a })
+
+instance FromJSON KeyListEntry where
+    parseJSON = withObject "KeyListEntry" $ \o -> KeyListEntry
+        <$> o .:? "KeyArn"
+        <*> o .:? "KeyId"
+
+instance ToJSON KeyListEntry where
+    toJSON KeyListEntry{..} = object
+        [ "KeyId"  .= _kleKeyId
+        , "KeyArn" .= _kleKeyArn
+        ]
diff --git a/gen/Network/AWS/KMS/UpdateKeyDescription.hs b/gen/Network/AWS/KMS/UpdateKeyDescription.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/KMS/UpdateKeyDescription.hs
@@ -0,0 +1,100 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.KMS.UpdateKeyDescription
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+-- | 
+--
+-- <http://docs.aws.amazon.com/kms/latest/APIReference/API_UpdateKeyDescription.html>
+module Network.AWS.KMS.UpdateKeyDescription
+    (
+    -- * Request
+      UpdateKeyDescription
+    -- ** Request constructor
+    , updateKeyDescription
+    -- ** Request lenses
+    , ukdDescription
+    , ukdKeyId
+
+    -- * Response
+    , UpdateKeyDescriptionResponse
+    -- ** Response constructor
+    , updateKeyDescriptionResponse
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.JSON
+import Network.AWS.KMS.Types
+import qualified GHC.Exts
+
+data UpdateKeyDescription = UpdateKeyDescription
+    { _ukdDescription :: Text
+    , _ukdKeyId       :: Text
+    } deriving (Eq, Ord, Show)
+
+-- | 'UpdateKeyDescription' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'ukdDescription' @::@ 'Text'
+--
+-- * 'ukdKeyId' @::@ 'Text'
+--
+updateKeyDescription :: Text -- ^ 'ukdKeyId'
+                     -> Text -- ^ 'ukdDescription'
+                     -> UpdateKeyDescription
+updateKeyDescription p1 p2 = UpdateKeyDescription
+    { _ukdKeyId       = p1
+    , _ukdDescription = p2
+    }
+
+ukdDescription :: Lens' UpdateKeyDescription Text
+ukdDescription = lens _ukdDescription (\s a -> s { _ukdDescription = a })
+
+ukdKeyId :: Lens' UpdateKeyDescription Text
+ukdKeyId = lens _ukdKeyId (\s a -> s { _ukdKeyId = a })
+
+data UpdateKeyDescriptionResponse = UpdateKeyDescriptionResponse
+    deriving (Eq, Ord, Show, Generic)
+
+-- | 'UpdateKeyDescriptionResponse' constructor.
+updateKeyDescriptionResponse :: UpdateKeyDescriptionResponse
+updateKeyDescriptionResponse = UpdateKeyDescriptionResponse
+
+instance ToPath UpdateKeyDescription where
+    toPath = const "/"
+
+instance ToQuery UpdateKeyDescription where
+    toQuery = const mempty
+
+instance ToHeaders UpdateKeyDescription
+
+instance ToJSON UpdateKeyDescription where
+    toJSON UpdateKeyDescription{..} = object
+        [ "KeyId"       .= _ukdKeyId
+        , "Description" .= _ukdDescription
+        ]
+
+instance AWSRequest UpdateKeyDescription where
+    type Sv UpdateKeyDescription = KMS
+    type Rs UpdateKeyDescription = UpdateKeyDescriptionResponse
+
+    request  = post "UpdateKeyDescription"
+    response = nullResponse UpdateKeyDescriptionResponse
