diff --git a/amazonka-rds.cabal b/amazonka-rds.cabal
--- a/amazonka-rds.cabal
+++ b/amazonka-rds.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-rds
-version:               0.3.3
+version:               0.3.4
 synopsis:              Amazon Relational Database Service SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -59,6 +59,8 @@
         , Network.AWS.RDS.DeleteDBSubnetGroup
         , Network.AWS.RDS.DeleteEventSubscription
         , Network.AWS.RDS.DeleteOptionGroup
+        , Network.AWS.RDS.DescribeAccountAttributes
+        , Network.AWS.RDS.DescribeCertificates
         , Network.AWS.RDS.DescribeDBEngineVersions
         , Network.AWS.RDS.DescribeDBInstances
         , Network.AWS.RDS.DescribeDBLogFiles
@@ -99,5 +101,5 @@
     other-modules:
 
     build-depends:
-          amazonka-core == 0.3.3.*
+          amazonka-core == 0.3.4.*
         , base          >= 4.7     && < 5
diff --git a/gen/Network/AWS/RDS.hs b/gen/Network/AWS/RDS.hs
--- a/gen/Network/AWS/RDS.hs
+++ b/gen/Network/AWS/RDS.hs
@@ -38,6 +38,8 @@
     , module Network.AWS.RDS.DeleteDBSubnetGroup
     , module Network.AWS.RDS.DeleteEventSubscription
     , module Network.AWS.RDS.DeleteOptionGroup
+    , module Network.AWS.RDS.DescribeAccountAttributes
+    , module Network.AWS.RDS.DescribeCertificates
     , module Network.AWS.RDS.DescribeDBEngineVersions
     , module Network.AWS.RDS.DescribeDBInstances
     , module Network.AWS.RDS.DescribeDBLogFiles
@@ -98,6 +100,8 @@
 import Network.AWS.RDS.DeleteDBSubnetGroup
 import Network.AWS.RDS.DeleteEventSubscription
 import Network.AWS.RDS.DeleteOptionGroup
+import Network.AWS.RDS.DescribeAccountAttributes
+import Network.AWS.RDS.DescribeCertificates
 import Network.AWS.RDS.DescribeDBEngineVersions
 import Network.AWS.RDS.DescribeDBInstances
 import Network.AWS.RDS.DescribeDBLogFiles
diff --git a/gen/Network/AWS/RDS/ApplyPendingMaintenanceAction.hs b/gen/Network/AWS/RDS/ApplyPendingMaintenanceAction.hs
--- a/gen/Network/AWS/RDS/ApplyPendingMaintenanceAction.hs
+++ b/gen/Network/AWS/RDS/ApplyPendingMaintenanceAction.hs
@@ -22,7 +22,8 @@
 --
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
--- | Applies a pending maintenance action to a resource.
+-- | Applies a pending maintenance action to a resource (for example, a DB
+-- instance).
 --
 -- <http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_ApplyPendingMaintenanceAction.html>
 module Network.AWS.RDS.ApplyPendingMaintenanceAction
@@ -79,8 +80,8 @@
 apmaApplyAction :: Lens' ApplyPendingMaintenanceAction Text
 apmaApplyAction = lens _apmaApplyAction (\s a -> s { _apmaApplyAction = a })
 
--- | Specify an opt-in request, or undo an opt-in request. An opt-in request of
--- type 'immediate' cannot be undone.
+-- | A value that specifies the type of opt-in request, or undoes an opt-in
+-- request. An opt-in request of type 'immediate' cannot be undone.
 --
 -- Valid values:
 --
@@ -91,8 +92,7 @@
 apmaOptInType :: Lens' ApplyPendingMaintenanceAction Text
 apmaOptInType = lens _apmaOptInType (\s a -> s { _apmaOptInType = a })
 
--- | The ARN of the resource (for example, a DB Instance) that the pending
--- maintenance action applies to.
+-- | The ARN of the resource that the pending maintenance action applies to.
 apmaResourceIdentifier :: Lens' ApplyPendingMaintenanceAction Text
 apmaResourceIdentifier =
     lens _apmaResourceIdentifier (\s a -> s { _apmaResourceIdentifier = a })
diff --git a/gen/Network/AWS/RDS/CreateDBInstance.hs b/gen/Network/AWS/RDS/CreateDBInstance.hs
--- a/gen/Network/AWS/RDS/CreateDBInstance.hs
+++ b/gen/Network/AWS/RDS/CreateDBInstance.hs
@@ -315,7 +315,7 @@
 -- Constraints:
 --
 -- Must contain 1 to 64 alphanumeric characters Cannot be a word reserved by
--- the specified database engine  PostgreSQL
+-- the specified database engine   PostgreSQL
 --
 -- The name of the database to create when the DB instance is created. If this
 -- parameter is not specified, no database is created in the DB instance.
@@ -324,7 +324,7 @@
 --
 -- Must contain 1 to 63 alphanumeric characters Must begin with a letter or an
 -- underscore. Subsequent characters can be letters, underscores, or digits
--- (0-9). Cannot be a word reserved by the specified database engine  Oracle
+-- (0-9). Cannot be a word reserved by the specified database engine   Oracle
 --
 -- The Oracle System ID (SID) of the created DB instance.
 --
@@ -332,7 +332,7 @@
 --
 -- Constraints:
 --
--- Cannot be longer than 8 characters  SQL Server
+-- Cannot be longer than 8 characters   SQL Server
 --
 -- Not applicable. Must be null.
 cdbiDBName :: Lens' CreateDBInstance (Maybe Text)
@@ -382,30 +382,94 @@
 --
 -- MySQL
 --
--- Version 5.1: ' 5.1.45 | 5.1.49 | 5.1.50 | 5.1.57 | 5.1.61 | 5.1.62 | 5.1.63| 5.1.69 | 5.1.71 | 5.1.73'   Version 5.5: ' 5.5.12 | 5.5.20 | 5.5.23 | 5.5.25a| 5.5.27 | 5.5.31 | 5.5.33 | 5.5.37 | 5.5.38 | 5.5.8'   Version 5.6: ' 5.6.12 |5.6.13 | 5.6.17 | 5.6.19 | 5.6.21'   Oracle Database Enterprise Edition
--- (oracle-ee)
+-- Version 5.1 (Only available in the following regions: ap-northeast-1,
+-- ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1, us-west-1, us-west-2): '5.1.73a | 5.1.73b'   Version 5.5 (Only available in the following regions:
+-- ap-northeast-1, ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1,
+-- us-west-1, us-west-2): ' 5.5.40 | 5.5.40a'   Version 5.5 (Available in all
+-- regions): ' 5.5.40b | 5.5.41'   Version 5.6 (Available in all regions): '5.6.19a | 5.6.19b | 5.6.21 | 5.6.21b | 5.6.22'    MySQL
 --
--- Version 11.2: ' 11.2.0.2.v3 | 11.2.0.2.v4 | 11.2.0.2.v5 | 11.2.0.2.v6 |11.2.0.2.v7 | 11.2.0.3.v1 | 11.2.0.4.v1'   Oracle Database Standard Edition
--- (oracle-se)
+-- Version 5.1 (Only available in the following regions: ap-northeast-1,
+-- ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1, us-west-1, us-west-2): '5.1.73a | 5.1.73b'   Version 5.5 (Only available in the following regions:
+-- ap-northeast-1, ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1,
+-- us-west-1, us-west-2): ' 5.5.40 | 5.5.40a'   Version 5.5 (Available in all
+-- regions): ' 5.5.40b | 5.5.41'   Version 5.6 (Available in all regions): '5.6.19a | 5.6.19b | 5.6.21 | 5.6.21b | 5.6.22'    MySQL
 --
--- Version 11.2: ' 11.2.0.2.v3 | 11.2.0.2.v4 | 11.2.0.2.v5 | 11.2.0.2.v6 |11.2.0.2.v7 | 11.2.0.3.v1 | 11.2.0.4.v1'   Oracle Database Standard Edition
--- One (oracle-se1)
+-- Version 5.1 (Only available in the following regions: ap-northeast-1,
+-- ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1, us-west-1, us-west-2): '5.1.73a | 5.1.73b'   Version 5.5 (Only available in the following regions:
+-- ap-northeast-1, ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1,
+-- us-west-1, us-west-2): ' 5.5.40 | 5.5.40a'   Version 5.5 (Available in all
+-- regions): ' 5.5.40b | 5.5.41'   Version 5.6 (Available in all regions): '5.6.19a | 5.6.19b | 5.6.21 | 5.6.21b | 5.6.22'    MySQL
 --
--- Version 11.2: ' 11.2.0.2.v3 | 11.2.0.2.v4 | 11.2.0.2.v5 | 11.2.0.2.v6 |11.2.0.2.v7 | 11.2.0.3.v1 | 11.2.0.4.v1'   PostgreSQL
+-- Version 5.1 (Only available in the following regions: ap-northeast-1,
+-- ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1, us-west-1, us-west-2): '5.1.73a | 5.1.73b'   Version 5.5 (Only available in the following regions:
+-- ap-northeast-1, ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1,
+-- us-west-1, us-west-2): ' 5.5.40 | 5.5.40a'   Version 5.5 (Available in all
+-- regions): ' 5.5.40b | 5.5.41'   Version 5.6 (Available in all regions): '5.6.19a | 5.6.19b | 5.6.21 | 5.6.21b | 5.6.22'    Oracle Database Enterprise
+-- Edition (oracle-ee)
 --
--- Version 9.3: ' 9.3.1 | 9.3.2 | 9.3.3'   Microsoft SQL Server Enterprise
--- Edition (sqlserver-ee)
+-- Version 11.2 (Only available in the following regions: ap-northeast-1,
+-- ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1, us-west-1, us-west-2): '11.2.0.2.v3 | 11.2.0.2.v4 | 11.2.0.2.v5 | 11.2.0.2.v6 | 11.2.0.2.v7'   Version
+-- 11.2 (Available in all regions): ' 11.2.0.3.v1 | 11.2.0.3.v2 | 11.2.0.4.v1 |11.2.0.4.v3'    Oracle Database Enterprise Edition (oracle-ee)
 --
--- Version 10.5: ' 10.50.2789.0.v1'   Version 11.0: ' 11.00.2100.60.v1'   Microsoft SQL Server Express Edition (sqlserver-ex)
+-- Version 11.2 (Only available in the following regions: ap-northeast-1,
+-- ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1, us-west-1, us-west-2): '11.2.0.2.v3 | 11.2.0.2.v4 | 11.2.0.2.v5 | 11.2.0.2.v6 | 11.2.0.2.v7'   Version
+-- 11.2 (Available in all regions): ' 11.2.0.3.v1 | 11.2.0.3.v2 | 11.2.0.4.v1 |11.2.0.4.v3'    Oracle Database Standard Edition (oracle-se)
 --
+-- Version 11.2 (Only available in the following regions: us-west-1): '11.2.0.2.v3 | 11.2.0.2.v4 | 11.2.0.2.v5 | 11.2.0.2.v6 | 11.2.0.2.v7'   Version
+-- 11.2 (Only available in the following regions: eu-central-1, us-west-1): '11.2.0.3.v1 | 11.2.0.3.v2 | 11.2.0.4.v1 | 11.2.0.4.v3'    Oracle Database
+-- Standard Edition (oracle-se)
 --
--- Version 10.5: ' 10.50.2789.0.v1'   Version 11.0: ' 11.00.2100.60.v1'   Microsoft SQL Server Standard Edition (sqlserver-se)
+-- Version 11.2 (Only available in the following regions: us-west-1): '11.2.0.2.v3 | 11.2.0.2.v4 | 11.2.0.2.v5 | 11.2.0.2.v6 | 11.2.0.2.v7'   Version
+-- 11.2 (Only available in the following regions: eu-central-1, us-west-1): '11.2.0.3.v1 | 11.2.0.3.v2 | 11.2.0.4.v1 | 11.2.0.4.v3'    Oracle Database
+-- Standard Edition One (oracle-se1)
 --
+-- Version 11.2 (Only available in the following regions: us-west-1): '11.2.0.2.v3 | 11.2.0.2.v4 | 11.2.0.2.v5 | 11.2.0.2.v6 | 11.2.0.2.v7'   Version
+-- 11.2 (Only available in the following regions: eu-central-1, us-west-1): '11.2.0.3.v1 | 11.2.0.3.v2 | 11.2.0.4.v1 | 11.2.0.4.v3'    Oracle Database
+-- Standard Edition One (oracle-se1)
 --
--- Version 10.5: ' 10.50.2789.0.v1'   Version 11.0: ' 11.00.2100.60.v1'   Microsoft SQL Server Web Edition (sqlserver-web)
+-- Version 11.2 (Only available in the following regions: us-west-1): '11.2.0.2.v3 | 11.2.0.2.v4 | 11.2.0.2.v5 | 11.2.0.2.v6 | 11.2.0.2.v7'   Version
+-- 11.2 (Only available in the following regions: eu-central-1, us-west-1): '11.2.0.3.v1 | 11.2.0.3.v2 | 11.2.0.4.v1 | 11.2.0.4.v3'    PostgreSQL
 --
+-- Version 9.3 (Only available in the following regions: ap-northeast-1,
+-- ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1, us-west-1, us-west-2): '9.3.1 | 9.3.2'   Version 9.3 (Available in all regions): ' 9.3.3 | 9.3.5'    PostgreSQL
 --
--- Version 10.5: ' 10.50.2789.0.v1'   Version 11.0: ' 11.00.2100.60.v1'
+--
+-- Version 9.3 (Only available in the following regions: ap-northeast-1,
+-- ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1, us-west-1, us-west-2): '9.3.1 | 9.3.2'   Version 9.3 (Available in all regions): ' 9.3.3 | 9.3.5'    Microsoft SQL Server Enterprise Edition (sqlserver-ee)
+--
+--
+-- Version 10.50 (Only available in the following regions: eu-central-1,
+-- us-west-1): ' 10.50.2789.0.v1'   Version 11.00 (Only available in the following
+-- regions: eu-central-1, us-west-1): ' 11.00.2100.60.v1'    Microsoft SQL Server
+-- Enterprise Edition (sqlserver-ee)
+--
+-- Version 10.50 (Only available in the following regions: eu-central-1,
+-- us-west-1): ' 10.50.2789.0.v1'   Version 11.00 (Only available in the following
+-- regions: eu-central-1, us-west-1): ' 11.00.2100.60.v1'    Microsoft SQL Server
+-- Express Edition (sqlserver-ex)
+--
+-- Version 10.50 (Available in all regions): ' 10.50.2789.0.v1'   Version 11.00
+-- (Available in all regions): ' 11.00.2100.60.v1'    Microsoft SQL Server Express
+-- Edition (sqlserver-ex)
+--
+-- Version 10.50 (Available in all regions): ' 10.50.2789.0.v1'   Version 11.00
+-- (Available in all regions): ' 11.00.2100.60.v1'    Microsoft SQL Server
+-- Standard Edition (sqlserver-se)
+--
+-- Version 10.50 (Available in all regions): ' 10.50.2789.0.v1'   Version 11.00
+-- (Available in all regions): ' 11.00.2100.60.v1'    Microsoft SQL Server
+-- Standard Edition (sqlserver-se)
+--
+-- Version 10.50 (Available in all regions): ' 10.50.2789.0.v1'   Version 11.00
+-- (Available in all regions): ' 11.00.2100.60.v1'    Microsoft SQL Server Web
+-- Edition (sqlserver-web)
+--
+-- Version 10.50 (Available in all regions): ' 10.50.2789.0.v1'   Version 11.00
+-- (Available in all regions): ' 11.00.2100.60.v1'    Microsoft SQL Server Web
+-- Edition (sqlserver-web)
+--
+-- Version 10.50 (Available in all regions): ' 10.50.2789.0.v1'   Version 11.00
+-- (Available in all regions): ' 11.00.2100.60.v1'
 cdbiEngineVersion :: Lens' CreateDBInstance (Maybe Text)
 cdbiEngineVersion =
     lens _cdbiEngineVersion (\s a -> s { _cdbiEngineVersion = a })
@@ -453,6 +517,10 @@
 -- SQL Server
 --
 -- Constraints: Must contain from 8 to 128 characters.
+--
+-- PostgreSQL
+--
+-- Constraints: Must contain from 8 to 128 characters.
 cdbiMasterUserPassword :: Lens' CreateDBInstance Text
 cdbiMasterUserPassword =
     lens _cdbiMasterUserPassword (\s a -> s { _cdbiMasterUserPassword = a })
@@ -476,7 +544,12 @@
 -- Constraints:
 --
 -- Must be 1 to 128 alphanumeric characters. First character must be a letter.
--- Cannot be a reserved word for the chosen database engine.
+-- Cannot be a reserved word for the chosen database engine.   PostgreSQL
+--
+-- Constraints:
+--
+-- Must be 1 to 63 alphanumeric characters. First character must be a letter. Cannot be a reserved word for the chosen database engine.
+--
 cdbiMasterUsername :: Lens' CreateDBInstance Text
 cdbiMasterUsername =
     lens _cdbiMasterUsername (\s a -> s { _cdbiMasterUsername = a })
diff --git a/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs b/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs
--- a/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs
+++ b/gen/Network/AWS/RDS/DeleteDBParameterGroup.hs
@@ -25,9 +25,6 @@
 -- | Deletes a specified DBParameterGroup. The DBParameterGroup to be deleted
 -- cannot be associated with any DB instances.
 --
--- The specified DB parameter group cannot be associated with any DB
--- instances.
---
 -- <http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DeleteDBParameterGroup.html>
 module Network.AWS.RDS.DeleteDBParameterGroup
     (
diff --git a/gen/Network/AWS/RDS/DescribeAccountAttributes.hs b/gen/Network/AWS/RDS/DescribeAccountAttributes.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/RDS/DescribeAccountAttributes.hs
@@ -0,0 +1,105 @@
+{-# 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.RDS.DescribeAccountAttributes
+-- 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)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- | Lists all of the attributes for a customer account. The attributes include
+-- Amazon RDS quotas for the account, such as the number of DB instances
+-- allowed. The description for a quota includes the quota name, current usage
+-- toward that quota, and the quota's maximum value.
+--
+-- This command does not take any parameters.
+--
+-- <http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DescribeAccountAttributes.html>
+module Network.AWS.RDS.DescribeAccountAttributes
+    (
+    -- * Request
+      DescribeAccountAttributes
+    -- ** Request constructor
+    , describeAccountAttributes
+
+    -- * Response
+    , DescribeAccountAttributesResponse
+    -- ** Response constructor
+    , describeAccountAttributesResponse
+    -- ** Response lenses
+    , daarAccountQuotas
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.Query
+import Network.AWS.RDS.Types
+import qualified GHC.Exts
+
+data DescribeAccountAttributes = DescribeAccountAttributes
+    deriving (Eq, Ord, Read, Show, Generic)
+
+-- | 'DescribeAccountAttributes' constructor.
+describeAccountAttributes :: DescribeAccountAttributes
+describeAccountAttributes = DescribeAccountAttributes
+
+newtype DescribeAccountAttributesResponse = DescribeAccountAttributesResponse
+    { _daarAccountQuotas :: List "member" AccountQuota
+    } deriving (Eq, Read, Show, Monoid, Semigroup)
+
+instance GHC.Exts.IsList DescribeAccountAttributesResponse where
+    type Item DescribeAccountAttributesResponse = AccountQuota
+
+    fromList = DescribeAccountAttributesResponse . GHC.Exts.fromList
+    toList   = GHC.Exts.toList . _daarAccountQuotas
+
+-- | 'DescribeAccountAttributesResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'daarAccountQuotas' @::@ ['AccountQuota']
+--
+describeAccountAttributesResponse :: DescribeAccountAttributesResponse
+describeAccountAttributesResponse = DescribeAccountAttributesResponse
+    { _daarAccountQuotas = mempty
+    }
+
+-- | A list of 'AccountQuota' objects. Within this list, each quota has a name, a
+-- count of usage toward the quota maximum, and a maximum value for the quota.
+daarAccountQuotas :: Lens' DescribeAccountAttributesResponse [AccountQuota]
+daarAccountQuotas =
+    lens _daarAccountQuotas (\s a -> s { _daarAccountQuotas = a })
+        . _List
+
+instance ToPath DescribeAccountAttributes where
+    toPath = const "/"
+
+instance ToQuery DescribeAccountAttributes where
+    toQuery = const mempty
+
+instance ToHeaders DescribeAccountAttributes
+
+instance AWSRequest DescribeAccountAttributes where
+    type Sv DescribeAccountAttributes = RDS
+    type Rs DescribeAccountAttributes = DescribeAccountAttributesResponse
+
+    request  = post "DescribeAccountAttributes"
+    response = xmlResponse
+
+instance FromXML DescribeAccountAttributesResponse where
+    parseXML = withElement "DescribeAccountAttributesResult" $ \x -> DescribeAccountAttributesResponse
+        <$> x .@? "AccountQuotas" .!@ mempty
diff --git a/gen/Network/AWS/RDS/DescribeCertificates.hs b/gen/Network/AWS/RDS/DescribeCertificates.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/RDS/DescribeCertificates.hs
@@ -0,0 +1,167 @@
+{-# 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.RDS.DescribeCertificates
+-- 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)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- | Lists the set of CA certificates provided by Amazon RDS for this AWS
+-- account.
+--
+-- <http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DescribeCertificates.html>
+module Network.AWS.RDS.DescribeCertificates
+    (
+    -- * Request
+      DescribeCertificates
+    -- ** Request constructor
+    , describeCertificates
+    -- ** Request lenses
+    , dcCertificateIdentifier
+    , dcFilters
+    , dcMarker
+    , dcMaxRecords
+
+    -- * Response
+    , DescribeCertificatesResponse
+    -- ** Response constructor
+    , describeCertificatesResponse
+    -- ** Response lenses
+    , dcrCertificates
+    , dcrMarker
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.Query
+import Network.AWS.RDS.Types
+import qualified GHC.Exts
+
+data DescribeCertificates = DescribeCertificates
+    { _dcCertificateIdentifier :: Maybe Text
+    , _dcFilters               :: List "member" Filter
+    , _dcMarker                :: Maybe Text
+    , _dcMaxRecords            :: Maybe Int
+    } deriving (Eq, Read, Show)
+
+-- | 'DescribeCertificates' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'dcCertificateIdentifier' @::@ 'Maybe' 'Text'
+--
+-- * 'dcFilters' @::@ ['Filter']
+--
+-- * 'dcMarker' @::@ 'Maybe' 'Text'
+--
+-- * 'dcMaxRecords' @::@ 'Maybe' 'Int'
+--
+describeCertificates :: DescribeCertificates
+describeCertificates = DescribeCertificates
+    { _dcCertificateIdentifier = Nothing
+    , _dcFilters               = mempty
+    , _dcMaxRecords            = Nothing
+    , _dcMarker                = Nothing
+    }
+
+-- | The user-supplied certificate identifier. If this parameter is specified,
+-- information for only the identified certificate is returned. This parameter
+-- isn't case-sensitive.
+--
+-- Constraints:
+--
+-- Must contain from 1 to 63 alphanumeric characters or hyphens First
+-- character must be a letter Cannot end with a hyphen or contain two
+-- consecutive hyphens
+dcCertificateIdentifier :: Lens' DescribeCertificates (Maybe Text)
+dcCertificateIdentifier =
+    lens _dcCertificateIdentifier (\s a -> s { _dcCertificateIdentifier = a })
+
+-- | This parameter is not currently supported.
+dcFilters :: Lens' DescribeCertificates [Filter]
+dcFilters = lens _dcFilters (\s a -> s { _dcFilters = a }) . _List
+
+-- | An optional pagination token provided by a previous 'DescribeCertificates'
+-- request. If this parameter is specified, the response includes only records
+-- beyond the marker, up to the value specified by 'MaxRecords'.
+dcMarker :: Lens' DescribeCertificates (Maybe Text)
+dcMarker = lens _dcMarker (\s a -> s { _dcMarker = a })
+
+-- | The maximum number of records to include in the response. If more records
+-- exist than the specified 'MaxRecords' value, a pagination token called a marker
+-- is included in the response so that the remaining results can be retrieved.
+--
+-- Default: 100
+--
+-- Constraints: Minimum 20, maximum 100
+dcMaxRecords :: Lens' DescribeCertificates (Maybe Int)
+dcMaxRecords = lens _dcMaxRecords (\s a -> s { _dcMaxRecords = a })
+
+data DescribeCertificatesResponse = DescribeCertificatesResponse
+    { _dcrCertificates :: List "member" Certificate
+    , _dcrMarker       :: Maybe Text
+    } deriving (Eq, Read, Show)
+
+-- | 'DescribeCertificatesResponse' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'dcrCertificates' @::@ ['Certificate']
+--
+-- * 'dcrMarker' @::@ 'Maybe' 'Text'
+--
+describeCertificatesResponse :: DescribeCertificatesResponse
+describeCertificatesResponse = DescribeCertificatesResponse
+    { _dcrCertificates = mempty
+    , _dcrMarker       = Nothing
+    }
+
+-- | The list of 'Certificate' objects for the AWS account.
+dcrCertificates :: Lens' DescribeCertificatesResponse [Certificate]
+dcrCertificates = lens _dcrCertificates (\s a -> s { _dcrCertificates = a }) . _List
+
+-- | An optional pagination token provided by a previous 'DescribeCertificates'
+-- request. If this parameter is specified, the response includes only records
+-- beyond the marker, up to the value specified by 'MaxRecords' .
+dcrMarker :: Lens' DescribeCertificatesResponse (Maybe Text)
+dcrMarker = lens _dcrMarker (\s a -> s { _dcrMarker = a })
+
+instance ToPath DescribeCertificates where
+    toPath = const "/"
+
+instance ToQuery DescribeCertificates where
+    toQuery DescribeCertificates{..} = mconcat
+        [ "CertificateIdentifier" =? _dcCertificateIdentifier
+        , "Filters"               =? _dcFilters
+        , "Marker"                =? _dcMarker
+        , "MaxRecords"            =? _dcMaxRecords
+        ]
+
+instance ToHeaders DescribeCertificates
+
+instance AWSRequest DescribeCertificates where
+    type Sv DescribeCertificates = RDS
+    type Rs DescribeCertificates = DescribeCertificatesResponse
+
+    request  = post "DescribeCertificates"
+    response = xmlResponse
+
+instance FromXML DescribeCertificatesResponse where
+    parseXML = withElement "DescribeCertificatesResult" $ \x -> DescribeCertificatesResponse
+        <$> x .@? "Certificates" .!@ mempty
+        <*> x .@? "Marker"
diff --git a/gen/Network/AWS/RDS/DescribePendingMaintenanceActions.hs b/gen/Network/AWS/RDS/DescribePendingMaintenanceActions.hs
--- a/gen/Network/AWS/RDS/DescribePendingMaintenanceActions.hs
+++ b/gen/Network/AWS/RDS/DescribePendingMaintenanceActions.hs
@@ -22,7 +22,7 @@
 --
 -- Derived from AWS service descriptions, licensed under Apache 2.0.
 
--- | Returns a list of resources (for example, DB Instances) that have at least
+-- | Returns a list of resources (for example, DB instances) that have at least
 -- one pending maintenance action.
 --
 -- <http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DescribePendingMaintenanceActions.html>
@@ -79,16 +79,19 @@
     , _dpmaMaxRecords         = Nothing
     }
 
--- | Supported filters:
+-- | A filter that specifies one or more resources to return pending maintenance
+-- actions for.
 --
--- 'db-instance-id' - Accepts DB instance identifiers and DB instance ARNs. The
--- result list will only include maintenance actions for the specified DB
--- Instances.
+-- Supported filters:
+--
+-- 'db-instance-id' - Accepts DB instance identifiers and DB instance Amazon
+-- Resource Names (ARNs). The results list will only include pending maintenance
+-- actions for the DB instances identified by these ARNs.
 dpmaFilters :: Lens' DescribePendingMaintenanceActions [Filter]
 dpmaFilters = lens _dpmaFilters (\s a -> s { _dpmaFilters = a }) . _List
 
 -- | An optional pagination token provided by a previous 'DescribePendingMaintenanceActions' request. If this parameter is specified, the response includes only records
--- beyond the marker, up to a number of records specified by 'MaxRecords' .
+-- beyond the marker, up to a number of records specified by 'MaxRecords'.
 dpmaMarker :: Lens' DescribePendingMaintenanceActions (Maybe Text)
 dpmaMarker = lens _dpmaMarker (\s a -> s { _dpmaMarker = a })
 
@@ -102,7 +105,7 @@
 dpmaMaxRecords :: Lens' DescribePendingMaintenanceActions (Maybe Int)
 dpmaMaxRecords = lens _dpmaMaxRecords (\s a -> s { _dpmaMaxRecords = a })
 
--- | The ARN of the resource to return pending maintenance actions for.
+-- | The ARN of a resource to return pending maintenance actions for.
 dpmaResourceIdentifier :: Lens' DescribePendingMaintenanceActions (Maybe Text)
 dpmaResourceIdentifier =
     lens _dpmaResourceIdentifier (\s a -> s { _dpmaResourceIdentifier = a })
@@ -127,11 +130,11 @@
     }
 
 -- | An optional pagination token provided by a previous 'DescribePendingMaintenanceActions' request. If this parameter is specified, the response includes only records
--- beyond the marker, up to a number of records specified by 'MaxRecords' .
+-- beyond the marker, up to a number of records specified by 'MaxRecords'.
 dpmarMarker :: Lens' DescribePendingMaintenanceActionsResponse (Maybe Text)
 dpmarMarker = lens _dpmarMarker (\s a -> s { _dpmarMarker = a })
 
--- | Provides a list of the pending maintenance actions for the resource.
+-- | A list of the pending maintenance actions for the resource.
 dpmarPendingMaintenanceActions :: Lens' DescribePendingMaintenanceActionsResponse [ResourcePendingMaintenanceActions]
 dpmarPendingMaintenanceActions =
     lens _dpmarPendingMaintenanceActions
diff --git a/gen/Network/AWS/RDS/ModifyDBInstance.hs b/gen/Network/AWS/RDS/ModifyDBInstance.hs
--- a/gen/Network/AWS/RDS/ModifyDBInstance.hs
+++ b/gen/Network/AWS/RDS/ModifyDBInstance.hs
@@ -39,6 +39,7 @@
     , mdbiApplyImmediately
     , mdbiAutoMinorVersionUpgrade
     , mdbiBackupRetentionPeriod
+    , mdbiCACertificateIdentifier
     , mdbiDBInstanceClass
     , mdbiDBInstanceIdentifier
     , mdbiDBParameterGroupName
@@ -75,6 +76,7 @@
     , _mdbiApplyImmediately           :: Maybe Bool
     , _mdbiAutoMinorVersionUpgrade    :: Maybe Bool
     , _mdbiBackupRetentionPeriod      :: Maybe Int
+    , _mdbiCACertificateIdentifier    :: Maybe Text
     , _mdbiDBInstanceClass            :: Maybe Text
     , _mdbiDBInstanceIdentifier       :: Text
     , _mdbiDBParameterGroupName       :: Maybe Text
@@ -107,6 +109,8 @@
 --
 -- * 'mdbiBackupRetentionPeriod' @::@ 'Maybe' 'Int'
 --
+-- * 'mdbiCACertificateIdentifier' @::@ 'Maybe' 'Text'
+--
 -- * 'mdbiDBInstanceClass' @::@ 'Maybe' 'Text'
 --
 -- * 'mdbiDBInstanceIdentifier' @::@ 'Text'
@@ -163,6 +167,7 @@
     , _mdbiStorageType                = Nothing
     , _mdbiTdeCredentialArn           = Nothing
     , _mdbiTdeCredentialPassword      = Nothing
+    , _mdbiCACertificateIdentifier    = Nothing
     }
 
 -- | The new storage capacity of the RDS instance. Changing this setting does not
@@ -287,6 +292,12 @@
     lens _mdbiBackupRetentionPeriod
         (\s a -> s { _mdbiBackupRetentionPeriod = a })
 
+-- | Indicates the certificate which needs to be associated with the instance.
+mdbiCACertificateIdentifier :: Lens' ModifyDBInstance (Maybe Text)
+mdbiCACertificateIdentifier =
+    lens _mdbiCACertificateIdentifier
+        (\s a -> s { _mdbiCACertificateIdentifier = a })
+
 -- | The new compute and memory capacity of the DB instance. To determine the
 -- instance classes that are available for a particular DB engine, use the 'DescribeOrderableDBInstanceOptions' action.
 --
@@ -408,7 +419,7 @@
 -- Server).
 --
 -- Amazon RDS API actions never return the password, so this action provides a
--- way to regain access to a master instance user if the password is lost. This
+-- way to regain access to a primary instance user if the password is lost. This
 -- includes restoring privileges that may have been accidentally revoked.
 mdbiMasterUserPassword :: Lens' ModifyDBInstance (Maybe Text)
 mdbiMasterUserPassword =
@@ -554,6 +565,7 @@
         , "ApplyImmediately"           =? _mdbiApplyImmediately
         , "AutoMinorVersionUpgrade"    =? _mdbiAutoMinorVersionUpgrade
         , "BackupRetentionPeriod"      =? _mdbiBackupRetentionPeriod
+        , "CACertificateIdentifier"    =? _mdbiCACertificateIdentifier
         , "DBInstanceClass"            =? _mdbiDBInstanceClass
         , "DBInstanceIdentifier"       =? _mdbiDBInstanceIdentifier
         , "DBParameterGroupName"       =? _mdbiDBParameterGroupName
diff --git a/gen/Network/AWS/RDS/PromoteReadReplica.hs b/gen/Network/AWS/RDS/PromoteReadReplica.hs
--- a/gen/Network/AWS/RDS/PromoteReadReplica.hs
+++ b/gen/Network/AWS/RDS/PromoteReadReplica.hs
@@ -30,6 +30,7 @@
 -- backups are taken based on your backup settings.
 --
 --
+--
 -- <http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_PromoteReadReplica.html>
 module Network.AWS.RDS.PromoteReadReplica
     (
diff --git a/gen/Network/AWS/RDS/Types.hs b/gen/Network/AWS/RDS/Types.hs
--- a/gen/Network/AWS/RDS/Types.hs
+++ b/gen/Network/AWS/RDS/Types.hs
@@ -38,6 +38,7 @@
     , pmaAction
     , pmaAutoAppliedAfterDate
     , pmaCurrentApplyDate
+    , pmaDescription
     , pmaForcedApplyDate
     , pmaOptInStatus
 
@@ -232,6 +233,7 @@
     , dbiAutoMinorVersionUpgrade
     , dbiAvailabilityZone
     , dbiBackupRetentionPeriod
+    , dbiCACertificateIdentifier
     , dbiCharacterSetName
     , dbiDBInstanceClass
     , dbiDBInstanceIdentifier
@@ -265,6 +267,13 @@
     , dbiTdeCredentialArn
     , dbiVpcSecurityGroups
 
+    -- * AccountQuota
+    , AccountQuota
+    , accountQuota
+    , aqAccountQuotaName
+    , aqMax
+    , aqUsed
+
     -- * AvailabilityZone
     , AvailabilityZone
     , availabilityZone
@@ -292,6 +301,15 @@
     , dbsg1Subnets
     , dbsg1VpcId
 
+    -- * Certificate
+    , Certificate
+    , certificate
+    , cCertificateIdentifier
+    , cCertificateType
+    , cThumbprint
+    , cValidFrom
+    , cValidTill
+
     -- * DBInstanceStatusInfo
     , DBInstanceStatusInfo
     , dbinstanceStatusInfo
@@ -397,6 +415,7 @@
     , pendingModifiedValues
     , pmvAllocatedStorage
     , pmvBackupRetentionPeriod
+    , pmvCACertificateIdentifier
     , pmvDBInstanceClass
     , pmvDBInstanceIdentifier
     , pmvEngineVersion
@@ -491,6 +510,7 @@
     { _pmaAction               :: Maybe Text
     , _pmaAutoAppliedAfterDate :: Maybe ISO8601
     , _pmaCurrentApplyDate     :: Maybe ISO8601
+    , _pmaDescription          :: Maybe Text
     , _pmaForcedApplyDate      :: Maybe ISO8601
     , _pmaOptInStatus          :: Maybe Text
     } deriving (Eq, Ord, Read, Show)
@@ -505,6 +525,8 @@
 --
 -- * 'pmaCurrentApplyDate' @::@ 'Maybe' 'UTCTime'
 --
+-- * 'pmaDescription' @::@ 'Maybe' 'Text'
+--
 -- * 'pmaForcedApplyDate' @::@ 'Maybe' 'UTCTime'
 --
 -- * 'pmaOptInStatus' @::@ 'Maybe' 'Text'
@@ -516,6 +538,7 @@
     , _pmaForcedApplyDate      = Nothing
     , _pmaOptInStatus          = Nothing
     , _pmaCurrentApplyDate     = Nothing
+    , _pmaDescription          = Nothing
     }
 
 -- | The type of pending maintenance action that is available for the resource.
@@ -531,14 +554,17 @@
         . mapping _Time
 
 -- | The effective date when the pending maintenance action will be applied to the
--- resource. This takes into account opt-in requests received from the 'ApplyPendingMaintenanceAction' API, the 'AutoAppliedAfterDate', and the 'ForcedApplyDate'. This value is blank
--- if an opt-in request has not been received and no value has been specified
--- for the 'AutoAppliedAfterDate' or 'ForcedApplyDate'.
+-- resource. This date takes into account opt-in requests received from the 'ApplyPendingMaintenanceAction' API, the 'AutoAppliedAfterDate', and the 'ForcedApplyDate'. This value is blank
+-- if an opt-in request has not been received and nothing has been specified as 'AutoAppliedAfterDate' or 'ForcedApplyDate'.
 pmaCurrentApplyDate :: Lens' PendingMaintenanceAction (Maybe UTCTime)
 pmaCurrentApplyDate =
     lens _pmaCurrentApplyDate (\s a -> s { _pmaCurrentApplyDate = a })
         . mapping _Time
 
+-- | A description providing more detail about the maintenance action.
+pmaDescription :: Lens' PendingMaintenanceAction (Maybe Text)
+pmaDescription = lens _pmaDescription (\s a -> s { _pmaDescription = a })
+
 -- | The date when the maintenance action will be automatically applied. The
 -- maintenance action will be applied to the resource on this date regardless of
 -- the maintenance window for the resource. If this date is specified, any 'immediate' opt-in requests are ignored.
@@ -556,6 +582,7 @@
         <$> x .@? "Action"
         <*> x .@? "AutoAppliedAfterDate"
         <*> x .@? "CurrentApplyDate"
+        <*> x .@? "Description"
         <*> x .@? "ForcedApplyDate"
         <*> x .@? "OptInStatus"
 
@@ -564,6 +591,7 @@
         [ "Action"               =? _pmaAction
         , "AutoAppliedAfterDate" =? _pmaAutoAppliedAfterDate
         , "CurrentApplyDate"     =? _pmaCurrentApplyDate
+        , "Description"          =? _pmaDescription
         , "ForcedApplyDate"      =? _pmaForcedApplyDate
         , "OptInStatus"          =? _pmaOptInStatus
         ]
@@ -1416,14 +1444,15 @@
     , _rpmaPendingMaintenanceActionDetails = mempty
     }
 
--- | Provides details about the pending maintenance actions for the resource.
+-- | A list that provides details about the pending maintenance actions for the
+-- resource.
 rpmaPendingMaintenanceActionDetails :: Lens' ResourcePendingMaintenanceActions [PendingMaintenanceAction]
 rpmaPendingMaintenanceActionDetails =
     lens _rpmaPendingMaintenanceActionDetails
         (\s a -> s { _rpmaPendingMaintenanceActionDetails = a })
             . _List
 
--- | The ARN of this resource that has pending maintenance actions.
+-- | The ARN of the resource that has pending maintenance actions.
 rpmaResourceIdentifier :: Lens' ResourcePendingMaintenanceActions (Maybe Text)
 rpmaResourceIdentifier =
     lens _rpmaResourceIdentifier (\s a -> s { _rpmaResourceIdentifier = a })
@@ -2131,6 +2160,7 @@
     , _dbiAutoMinorVersionUpgrade               :: Maybe Bool
     , _dbiAvailabilityZone                      :: Maybe Text
     , _dbiBackupRetentionPeriod                 :: Maybe Int
+    , _dbiCACertificateIdentifier               :: Maybe Text
     , _dbiCharacterSetName                      :: Maybe Text
     , _dbiDBInstanceClass                       :: Maybe Text
     , _dbiDBInstanceIdentifier                  :: Maybe Text
@@ -2177,6 +2207,8 @@
 --
 -- * 'dbiBackupRetentionPeriod' @::@ 'Maybe' 'Int'
 --
+-- * 'dbiCACertificateIdentifier' @::@ 'Maybe' 'Text'
+--
 -- * 'dbiCharacterSetName' @::@ 'Maybe' 'Text'
 --
 -- * 'dbiDBInstanceClass' @::@ 'Maybe' 'Text'
@@ -2279,6 +2311,7 @@
     , _dbiStorageEncrypted                      = Nothing
     , _dbiKmsKeyId                              = Nothing
     , _dbiDbiResourceId                         = Nothing
+    , _dbiCACertificateIdentifier               = Nothing
     }
 
 -- | Specifies the allocated storage size specified in gigabytes.
@@ -2303,6 +2336,12 @@
     lens _dbiBackupRetentionPeriod
         (\s a -> s { _dbiBackupRetentionPeriod = a })
 
+-- | The identifier of the CA certificate for this DB instance.
+dbiCACertificateIdentifier :: Lens' DBInstance (Maybe Text)
+dbiCACertificateIdentifier =
+    lens _dbiCACertificateIdentifier
+        (\s a -> s { _dbiCACertificateIdentifier = a })
+
 -- | If present, specifies the name of the character set that this instance is
 -- associated with.
 dbiCharacterSetName :: Lens' DBInstance (Maybe Text)
@@ -2517,6 +2556,7 @@
         <*> x .@? "AutoMinorVersionUpgrade"
         <*> x .@? "AvailabilityZone"
         <*> x .@? "BackupRetentionPeriod"
+        <*> x .@? "CACertificateIdentifier"
         <*> x .@? "CharacterSetName"
         <*> x .@? "DBInstanceClass"
         <*> x .@? "DBInstanceIdentifier"
@@ -2556,6 +2596,7 @@
         , "AutoMinorVersionUpgrade"               =? _dbiAutoMinorVersionUpgrade
         , "AvailabilityZone"                      =? _dbiAvailabilityZone
         , "BackupRetentionPeriod"                 =? _dbiBackupRetentionPeriod
+        , "CACertificateIdentifier"               =? _dbiCACertificateIdentifier
         , "CharacterSetName"                      =? _dbiCharacterSetName
         , "DBInstanceClass"                       =? _dbiDBInstanceClass
         , "DBInstanceIdentifier"                  =? _dbiDBInstanceIdentifier
@@ -2590,6 +2631,55 @@
         , "VpcSecurityGroups"                     =? _dbiVpcSecurityGroups
         ]
 
+data AccountQuota = AccountQuota
+    { _aqAccountQuotaName :: Maybe Text
+    , _aqMax              :: Maybe Integer
+    , _aqUsed             :: Maybe Integer
+    } deriving (Eq, Ord, Read, Show)
+
+-- | 'AccountQuota' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'aqAccountQuotaName' @::@ 'Maybe' 'Text'
+--
+-- * 'aqMax' @::@ 'Maybe' 'Integer'
+--
+-- * 'aqUsed' @::@ 'Maybe' 'Integer'
+--
+accountQuota :: AccountQuota
+accountQuota = AccountQuota
+    { _aqAccountQuotaName = Nothing
+    , _aqUsed             = Nothing
+    , _aqMax              = Nothing
+    }
+
+-- | The name of the Amazon RDS quota for this AWS account.
+aqAccountQuotaName :: Lens' AccountQuota (Maybe Text)
+aqAccountQuotaName =
+    lens _aqAccountQuotaName (\s a -> s { _aqAccountQuotaName = a })
+
+-- | The maximum allowed value for the quota.
+aqMax :: Lens' AccountQuota (Maybe Integer)
+aqMax = lens _aqMax (\s a -> s { _aqMax = a })
+
+-- | The amount currently used toward the quota maximum.
+aqUsed :: Lens' AccountQuota (Maybe Integer)
+aqUsed = lens _aqUsed (\s a -> s { _aqUsed = a })
+
+instance FromXML AccountQuota where
+    parseXML x = AccountQuota
+        <$> x .@? "AccountQuotaName"
+        <*> x .@? "Max"
+        <*> x .@? "Used"
+
+instance ToQuery AccountQuota where
+    toQuery AccountQuota{..} = mconcat
+        [ "AccountQuotaName" =? _aqAccountQuotaName
+        , "Max"              =? _aqMax
+        , "Used"             =? _aqUsed
+        ]
+
 newtype AvailabilityZone = AvailabilityZone
     { _azName :: Maybe Text
     } deriving (Eq, Ord, Read, Show, Monoid)
@@ -2814,6 +2904,75 @@
         , "VpcId"                    =? _dbsg1VpcId
         ]
 
+data Certificate = Certificate
+    { _cCertificateIdentifier :: Maybe Text
+    , _cCertificateType       :: Maybe Text
+    , _cThumbprint            :: Maybe Text
+    , _cValidFrom             :: Maybe ISO8601
+    , _cValidTill             :: Maybe ISO8601
+    } deriving (Eq, Ord, Read, Show)
+
+-- | 'Certificate' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'cCertificateIdentifier' @::@ 'Maybe' 'Text'
+--
+-- * 'cCertificateType' @::@ 'Maybe' 'Text'
+--
+-- * 'cThumbprint' @::@ 'Maybe' 'Text'
+--
+-- * 'cValidFrom' @::@ 'Maybe' 'UTCTime'
+--
+-- * 'cValidTill' @::@ 'Maybe' 'UTCTime'
+--
+certificate :: Certificate
+certificate = Certificate
+    { _cCertificateIdentifier = Nothing
+    , _cCertificateType       = Nothing
+    , _cThumbprint            = Nothing
+    , _cValidFrom             = Nothing
+    , _cValidTill             = Nothing
+    }
+
+-- | The unique key that identifies a certificate.
+cCertificateIdentifier :: Lens' Certificate (Maybe Text)
+cCertificateIdentifier =
+    lens _cCertificateIdentifier (\s a -> s { _cCertificateIdentifier = a })
+
+-- | The type of the certificate.
+cCertificateType :: Lens' Certificate (Maybe Text)
+cCertificateType = lens _cCertificateType (\s a -> s { _cCertificateType = a })
+
+-- | The thumbprint of the certificate.
+cThumbprint :: Lens' Certificate (Maybe Text)
+cThumbprint = lens _cThumbprint (\s a -> s { _cThumbprint = a })
+
+-- | The starting date from which the certificate is valid.
+cValidFrom :: Lens' Certificate (Maybe UTCTime)
+cValidFrom = lens _cValidFrom (\s a -> s { _cValidFrom = a }) . mapping _Time
+
+-- | The final date that the certificate continues to be valid.
+cValidTill :: Lens' Certificate (Maybe UTCTime)
+cValidTill = lens _cValidTill (\s a -> s { _cValidTill = a }) . mapping _Time
+
+instance FromXML Certificate where
+    parseXML x = Certificate
+        <$> x .@? "CertificateIdentifier"
+        <*> x .@? "CertificateType"
+        <*> x .@? "Thumbprint"
+        <*> x .@? "ValidFrom"
+        <*> x .@? "ValidTill"
+
+instance ToQuery Certificate where
+    toQuery Certificate{..} = mconcat
+        [ "CertificateIdentifier" =? _cCertificateIdentifier
+        , "CertificateType"       =? _cCertificateType
+        , "Thumbprint"            =? _cThumbprint
+        , "ValidFrom"             =? _cValidFrom
+        , "ValidTill"             =? _cValidTill
+        ]
+
 data DBInstanceStatusInfo = DBInstanceStatusInfo
     { _dbisiMessage    :: Maybe Text
     , _dbisiNormal     :: Maybe Bool
@@ -3592,16 +3751,17 @@
         ]
 
 data PendingModifiedValues = PendingModifiedValues
-    { _pmvAllocatedStorage      :: Maybe Int
-    , _pmvBackupRetentionPeriod :: Maybe Int
-    , _pmvDBInstanceClass       :: Maybe Text
-    , _pmvDBInstanceIdentifier  :: Maybe Text
-    , _pmvEngineVersion         :: Maybe Text
-    , _pmvIops                  :: Maybe Int
-    , _pmvMasterUserPassword    :: Maybe Text
-    , _pmvMultiAZ               :: Maybe Bool
-    , _pmvPort                  :: Maybe Int
-    , _pmvStorageType           :: Maybe Text
+    { _pmvAllocatedStorage        :: Maybe Int
+    , _pmvBackupRetentionPeriod   :: Maybe Int
+    , _pmvCACertificateIdentifier :: Maybe Text
+    , _pmvDBInstanceClass         :: Maybe Text
+    , _pmvDBInstanceIdentifier    :: Maybe Text
+    , _pmvEngineVersion           :: Maybe Text
+    , _pmvIops                    :: Maybe Int
+    , _pmvMasterUserPassword      :: Maybe Text
+    , _pmvMultiAZ                 :: Maybe Bool
+    , _pmvPort                    :: Maybe Int
+    , _pmvStorageType             :: Maybe Text
     } deriving (Eq, Ord, Read, Show)
 
 -- | 'PendingModifiedValues' constructor.
@@ -3612,6 +3772,8 @@
 --
 -- * 'pmvBackupRetentionPeriod' @::@ 'Maybe' 'Int'
 --
+-- * 'pmvCACertificateIdentifier' @::@ 'Maybe' 'Text'
+--
 -- * 'pmvDBInstanceClass' @::@ 'Maybe' 'Text'
 --
 -- * 'pmvDBInstanceIdentifier' @::@ 'Maybe' 'Text'
@@ -3630,16 +3792,17 @@
 --
 pendingModifiedValues :: PendingModifiedValues
 pendingModifiedValues = PendingModifiedValues
-    { _pmvDBInstanceClass       = Nothing
-    , _pmvAllocatedStorage      = Nothing
-    , _pmvMasterUserPassword    = Nothing
-    , _pmvPort                  = Nothing
-    , _pmvBackupRetentionPeriod = Nothing
-    , _pmvMultiAZ               = Nothing
-    , _pmvEngineVersion         = Nothing
-    , _pmvIops                  = Nothing
-    , _pmvDBInstanceIdentifier  = Nothing
-    , _pmvStorageType           = Nothing
+    { _pmvDBInstanceClass         = Nothing
+    , _pmvAllocatedStorage        = Nothing
+    , _pmvMasterUserPassword      = Nothing
+    , _pmvPort                    = Nothing
+    , _pmvBackupRetentionPeriod   = Nothing
+    , _pmvMultiAZ                 = Nothing
+    , _pmvEngineVersion           = Nothing
+    , _pmvIops                    = Nothing
+    , _pmvDBInstanceIdentifier    = Nothing
+    , _pmvStorageType             = Nothing
+    , _pmvCACertificateIdentifier = Nothing
     }
 
 -- | Contains the new 'AllocatedStorage' size for the DB instance that will be
@@ -3655,6 +3818,12 @@
     lens _pmvBackupRetentionPeriod
         (\s a -> s { _pmvBackupRetentionPeriod = a })
 
+-- | Specifies the identifier of the CA certificate for the DB instance.
+pmvCACertificateIdentifier :: Lens' PendingModifiedValues (Maybe Text)
+pmvCACertificateIdentifier =
+    lens _pmvCACertificateIdentifier
+        (\s a -> s { _pmvCACertificateIdentifier = a })
+
 -- | Contains the new 'DBInstanceClass' for the DB instance that will be applied or
 -- is in progress.
 pmvDBInstanceClass :: Lens' PendingModifiedValues (Maybe Text)
@@ -3699,6 +3868,7 @@
     parseXML x = PendingModifiedValues
         <$> x .@? "AllocatedStorage"
         <*> x .@? "BackupRetentionPeriod"
+        <*> x .@? "CACertificateIdentifier"
         <*> x .@? "DBInstanceClass"
         <*> x .@? "DBInstanceIdentifier"
         <*> x .@? "EngineVersion"
@@ -3710,16 +3880,17 @@
 
 instance ToQuery PendingModifiedValues where
     toQuery PendingModifiedValues{..} = mconcat
-        [ "AllocatedStorage"      =? _pmvAllocatedStorage
-        , "BackupRetentionPeriod" =? _pmvBackupRetentionPeriod
-        , "DBInstanceClass"       =? _pmvDBInstanceClass
-        , "DBInstanceIdentifier"  =? _pmvDBInstanceIdentifier
-        , "EngineVersion"         =? _pmvEngineVersion
-        , "Iops"                  =? _pmvIops
-        , "MasterUserPassword"    =? _pmvMasterUserPassword
-        , "MultiAZ"               =? _pmvMultiAZ
-        , "Port"                  =? _pmvPort
-        , "StorageType"           =? _pmvStorageType
+        [ "AllocatedStorage"        =? _pmvAllocatedStorage
+        , "BackupRetentionPeriod"   =? _pmvBackupRetentionPeriod
+        , "CACertificateIdentifier" =? _pmvCACertificateIdentifier
+        , "DBInstanceClass"         =? _pmvDBInstanceClass
+        , "DBInstanceIdentifier"    =? _pmvDBInstanceIdentifier
+        , "EngineVersion"           =? _pmvEngineVersion
+        , "Iops"                    =? _pmvIops
+        , "MasterUserPassword"      =? _pmvMasterUserPassword
+        , "MultiAZ"                 =? _pmvMultiAZ
+        , "Port"                    =? _pmvPort
+        , "StorageType"             =? _pmvStorageType
         ]
 
 data VpcSecurityGroupMembership = VpcSecurityGroupMembership
diff --git a/gen/Network/AWS/RDS/Waiters.hs b/gen/Network/AWS/RDS/Waiters.hs
--- a/gen/Network/AWS/RDS/Waiters.hs
+++ b/gen/Network/AWS/RDS/Waiters.hs
@@ -16,6 +16,7 @@
 module Network.AWS.RDS.Waiters where
 
 import Network.AWS.RDS.DescribeDBInstances
+import Network.AWS.RDS.DescribeDBSnapshots
 import Network.AWS.RDS.Types
 import Network.AWS.Waiters
 
@@ -61,5 +62,17 @@
             (folding (concatOf ddbirDBInstances) . dbiDBInstanceStatus . _Just)
         , matchAny "resetting-master-credentials" AcceptFailure
             (folding (concatOf ddbirDBInstances) . dbiDBInstanceStatus . _Just)
+        ]
+    }
+
+dbSnapshotCompleted :: Wait DescribeDBSnapshots
+dbSnapshotCompleted = Wait
+    { _waitName      = "DBSnapshotCompleted"
+    , _waitAttempts  = 40
+    , _waitDelay     = 15
+    , _waitAcceptors =
+        [ matchError "DBSnapshotNotFound" AcceptSuccess
+        , matchAll "available" AcceptSuccess
+            (folding (concatOf ddbsrDBSnapshots) . dbsStatus . _Just)
         ]
     }
