diff --git a/Cabal/src/Distribution/CabalSpecVersion.hs b/Cabal/src/Distribution/CabalSpecVersion.hs
index 8fc89c4db6851566d8a5a2f93ea689985e68f086..5e4345bdc592130a222db3298979208cee0c6415 100644
--- a/Cabal/src/Distribution/CabalSpecVersion.hs
+++ b/Cabal/src/Distribution/CabalSpecVersion.hs
@@ -28,6 +28,7 @@ data CabalSpecVersion
     | CabalSpecV3_0
     -- 3.2: no changes
     | CabalSpecV3_4
+    | CabalSpecV3_6
   deriving (Eq, Ord, Show, Read, Enum, Bounded, Typeable, Data, Generic)
 
 instance Binary CabalSpecVersion
@@ -38,6 +39,7 @@ instance NFData CabalSpecVersion where rnf = genericRnf
 --
 -- @since 3.0.0.0
 showCabalSpecVersion :: CabalSpecVersion -> String
+showCabalSpecVersion CabalSpecV3_6  = "3.6"
 showCabalSpecVersion CabalSpecV3_4  = "3.4"
 showCabalSpecVersion CabalSpecV3_0  = "3.0"
 showCabalSpecVersion CabalSpecV2_4  = "2.4"
@@ -56,7 +58,7 @@ showCabalSpecVersion CabalSpecV1_2  = "1.2"
 showCabalSpecVersion CabalSpecV1_0  = "1.0"
 
 cabalSpecLatest :: CabalSpecVersion
-cabalSpecLatest = CabalSpecV3_4
+cabalSpecLatest = CabalSpecV3_6
 
 -- | Parse 'CabalSpecVersion' from version digits.
 --
@@ -64,6 +66,7 @@ cabalSpecLatest = CabalSpecV3_4
 --
 cabalSpecFromVersionDigits :: [Int] -> Maybe CabalSpecVersion
 cabalSpecFromVersionDigits v
+    | v == [3,6]  = Just CabalSpecV3_6
     | v == [3,4]  = Just CabalSpecV3_4
     | v == [3,0]  = Just CabalSpecV3_0
     | v == [2,4]  = Just CabalSpecV2_4
@@ -84,6 +87,7 @@ cabalSpecFromVersionDigits v
 
 -- | @since 3.4.0.0
 cabalSpecToVersionDigits :: CabalSpecVersion -> [Int]
+cabalSpecToVersionDigits CabalSpecV3_6   = [3,6]
 cabalSpecToVersionDigits CabalSpecV3_4   = [3,4]
 cabalSpecToVersionDigits CabalSpecV3_0   = [3,0]
 cabalSpecToVersionDigits CabalSpecV2_4   = [2,4]
diff --git a/Cabal/src/Distribution/SPDX/LicenseListVersion.hs b/Cabal/src/Distribution/SPDX/LicenseListVersion.hs
index e19ce89ace5f7853e78882063055132ce0be5f92..2e2fa16df79dd7bcd6b1129621e5cf0ae711771e 100644
--- a/Cabal/src/Distribution/SPDX/LicenseListVersion.hs
+++ b/Cabal/src/Distribution/SPDX/LicenseListVersion.hs
@@ -14,6 +14,7 @@ data LicenseListVersion
   deriving (Eq, Ord, Show, Enum, Bounded)
 
 cabalSpecVersionToSPDXListVersion :: CabalSpecVersion -> LicenseListVersion
+cabalSpecVersionToSPDXListVersion CabalSpecV3_6 = LicenseListVersion_3_9
 cabalSpecVersionToSPDXListVersion CabalSpecV3_4 = LicenseListVersion_3_9
 cabalSpecVersionToSPDXListVersion CabalSpecV3_0 = LicenseListVersion_3_6
 cabalSpecVersionToSPDXListVersion CabalSpecV2_4 = LicenseListVersion_3_2
diff --git a/Cabal/tests/UnitTests/Distribution/Utils/Structured.hs b/Cabal/tests/UnitTests/Distribution/Utils/Structured.hs
index b88066fe2bedfccc3689634d524a156754a890ae..5bd3331fceaf1494515e96318a26e6ae5ad1eb04 100644
--- a/Cabal/tests/UnitTests/Distribution/Utils/Structured.hs
+++ b/Cabal/tests/UnitTests/Distribution/Utils/Structured.hs
@@ -24,7 +24,7 @@ tests = testGroup "Distribution.Utils.Structured"
     , testCase "SPDX.License"              $ structureHash (Proxy :: Proxy License)                    @?= md5FromInteger 0xd3d4a09f517f9f75bc3d16370d5a853a
     -- The difference is in encoding of newtypes
 #if MIN_VERSION_base(4,7,0)
-    , testCase "GenericPackageDescription" $ structureHash (Proxy :: Proxy GenericPackageDescription)  @?= md5FromInteger 0x2f869c09d0cd2288d55b0455830e5a61
-    , testCase "LocalBuildInfo"            $ structureHash (Proxy :: Proxy LocalBuildInfo)             @?= md5FromInteger 0x2d64c99467083bef4a894162a121c467
+    , testCase "GenericPackageDescription" $ structureHash (Proxy :: Proxy GenericPackageDescription)  @?= md5FromInteger 0x85108a50f7eef63ee549349b080548f3
+    , testCase "LocalBuildInfo"            $ structureHash (Proxy :: Proxy LocalBuildInfo)             @?= md5FromInteger 0xff0724263e69d314fc7cd327ca617264
 #endif
     ]
diff --git a/doc/file-format-changelog.rst b/doc/file-format-changelog.rst
index f3bb3cbdc80a252d7a15ddf1dcbd8fa8028f0b9c..a400abc39e1dd6d90bcceec150484ea00fccf0b6 100644
--- a/doc/file-format-changelog.rst
+++ b/doc/file-format-changelog.rst
@@ -19,6 +19,11 @@ relative to the respective preceding *published* version.
     versions of the ``Cabal`` library denote unreleased development
     branches which have no stability guarantee.
 
+``cabal-version: 3.6``
+----------------------
+
+* TBW
+
 ``cabal-version: 3.4``
 ----------------------