diff --git a/Cabal/ChangeLog.md b/Cabal/ChangeLog.md
index 4d574b60a2e162d663a2fc68765d39aa4c7d6520..5c70d3b0505428103d371fd6e2fec1a675d764e8 100644
--- a/Cabal/ChangeLog.md
+++ b/Cabal/ChangeLog.md
@@ -1,3 +1,9 @@
+# 3.6.2.0 [Emily Pillmore](mailgo:emilypi@cohomolo.gy) October 2021
+ * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.6.2.0.md
+
+# 3.6.1.0 [Emily Pillmore](mailgo:emilypi@cohomolo.gy) August 2021
+ * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.6.1.0.md
+
# 3.6.0.0 [Emily Pillmore](mailgo:emilypi@cohomolo.gy) August 2021
* See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.6.0.0.md
diff --git a/cabal-install/changelog b/cabal-install/changelog
index 068a26db51042c5b90202213ffe8a8f91eac2435..5612b44f1126ebe89e91f31ab6907d7400413fa9 100644
--- a/cabal-install/changelog
+++ b/cabal-install/changelog
@@ -1,4 +1,8 @@
-*-change-log-*-
+
+3.6.2.0 Emily Pillmore <emilypi@cohomolo.gy> October 2021
+ * See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.6.2.0.md
+
3.6.0.0 Emily Pillmore <emilypi@cohomolo.gy> August 2021
* See https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.6.0.0.md
diff --git a/changelog.d/issue-4683 b/changelog.d/issue-4683
new file mode 100644
index 0000000000000000000000000000000000000000..4bf63785525fac8264f52a8323489d375e3fcda4
--- /dev/null
+++ b/changelog.d/issue-4683
@@ -0,0 +1,4 @@
+synopsis: 'cabal check' to fail when no upper bounds for base or Cabal are present in setup dependencies
+packages: Cabal cabal-install
+issues: #4683
+prs: #5370 #7409
diff --git a/changelog.d/option-argument-errors b/changelog.d/option-argument-errors
new file mode 100644
index 0000000000000000000000000000000000000000..90d1f32d7ea794b1321bd36fcfd9aae83c2dd872
--- /dev/null
+++ b/changelog.d/option-argument-errors
@@ -0,0 +1,9 @@
+synopsis: Handle option argument parse errors without 'error'
+packages: Cabal cabal-install
+prs: #7579
+issues: #7573
+description: {
+- Errors parsing arguments such as `-v=3` no longer result in
+ stack traces.
+- `Distribution.ReadE.readEOrFail` was removed.
+}
diff --git a/changelog.d/pr-7296 b/changelog.d/pr-7296
new file mode 100644
index 0000000000000000000000000000000000000000..2dbd0a0576d896b192a64bc33ce7dba1fe2f8094
--- /dev/null
+++ b/changelog.d/pr-7296
@@ -0,0 +1,11 @@
+synopsis: Add 'preferred-versions' support for LocalIndexRepo
+packages: cabal-install
+prs: #7296
+issues: #7249 #5603
+
+description: {
+
+- `cabal outdated` honours the 'preferred-versions' file which might deprecate or prefer certain
+ versions of packages. In particular, if the only newer version of a package has been deprecated,
+ `cabal outdated` should not report that there are newer versions available.
+}
diff --git a/changelog.d/pr-7358 b/changelog.d/pr-7358
new file mode 100644
index 0000000000000000000000000000000000000000..9aea015d6ea445e9a484808fe8784dac4a92f223
--- /dev/null
+++ b/changelog.d/pr-7358
@@ -0,0 +1,21 @@
+synopsis: Expose `cabal-install` as library
+prs: #7358
+issues: #7224 #6090 #4798 #3781 #1597
+significance: significant
+description {
+
+- Exposes `cabal-install` as a library, bumping the `cabal-install` cabal version to 2.2, and removing the dogfooding framework surrounding `cabal-install` to facilitate easier testing.
+
+- Moves `cabal-install-solver` out to its own directory, and treats it as its own separate project. Addresses #6090, #7224, and #3781
+
+- Enable HPC coverage
+
+ - absorb `cabal-install-solver-dsl` module into the test modules, and
+ incorporate it into its own test target.
+
+ - Splits out `cabal-install` unit tests from long-running tests.
+
+ - Adds proper subcomponent coverage masking so we can finally generate
+ baseline coverage reports for `cabal-install`.
+
+}
\ No newline at end of file
diff --git a/changelog.d/pr-7536 b/changelog.d/pr-7536
new file mode 100644
index 0000000000000000000000000000000000000000..26b139ab6d6e87f8b3ac8f334195c62d32189242
--- /dev/null
+++ b/changelog.d/pr-7536
@@ -0,0 +1,4 @@
+synopsis: Add fields extra-libraries-static and extra-lib-dirs-static
+packages: Cabal
+prs: #7536
+issues: #7399 #6688
diff --git a/release-notes/Cabal-3.6.2.0.md b/release-notes/Cabal-3.6.2.0.md
new file mode 100644
index 0000000000000000000000000000000000000000..cce46775e09baaa68e99c481771e8cb440a31f00
--- /dev/null
+++ b/release-notes/Cabal-3.6.2.0.md
@@ -0,0 +1,18 @@
+### Significant changes
+
+
+- Make Paths_ modules work with non-standard preludes again [#5962](https://github.com/haskell/cabal/issues/5962)
+
+ - Generate Paths_ module with qualified Data.List.last import so that compatibility with non-standard preludes is not regressed compared to cabal 3.4.
+
+- Windows: redo the fix to breakage caused by new autoconf; the wrong fix made cabal sometimes fail with old autoconf [#7494](https://github.com/haskell/cabal/issues/7494) [#7649](https://github.com/haskell/cabal/issues/7649)
+
+ - Reverts #7510 that failed on Windows when used with pre-generated scripts included in packages such as network, time, process.
+ - Adds a subtler fix/workaround for the deficiencies of new autoconf versions on Windows.
+
+### Other changes
+
+
+- Regenerate bootstrap/ with GHC updated from 8.10.4 to 8.10.7
+
+ - This regenerates bootstrap plans using new package versions and also updating GHC from 8.10.4 to 8.10.7, as requested by GHC HQ.
diff --git a/release-notes/cabal-install-3.6.2.0.md b/release-notes/cabal-install-3.6.2.0.md
new file mode 100644
index 0000000000000000000000000000000000000000..19004ca46b8e1d3173b8b5e720d0516f84bd3aca
--- /dev/null
+++ b/release-notes/cabal-install-3.6.2.0.md
@@ -0,0 +1,16 @@
+### Significant changes
+
+- Make Paths_ modules work with non-standard preludes again [#5962](https://github.com/haskell/cabal/issues/5962)
+
+ - Generate Paths_ module with qualified Data.List.last import so that compatibility with non-standard preludes is not regressed compared to cabal 3.4.
+
+- Windows: redo the fix to breakage caused by new autoconf; the wrong fix made cabal sometimes fail with old autoconf [#7494](https://github.com/haskell/cabal/issues/7494) [#7649](https://github.com/haskell/cabal/issues/7649)
+
+ - Reverts #7510 that failed on Windows when used with pre-generated scripts included in packages such as network, time, process.
+ - Adds a subtler fix/workaround for the deficiencies of new autoconf versions on Windows.
+
+### Other changes
+
+- Regenerate bootstrap/ with GHC updated from 8.10.4 to 8.10.7
+
+ - This regenerates bootstrap plans using new package versions and also updating GHC from 8.10.4 to 8.10.7, as requested by GHC HQ.