diff --git a/containers/changelog.md b/containers/changelog.md
index 0dc504f7d10ccf17adc685d5dbf5bd26b817eb8f..450d47d9d1ebf0142d5280b3c569a857b545e04e 100644
--- a/containers/changelog.md
+++ b/containers/changelog.md
@@ -1,5 +1,27 @@
 # Changelog for [`containers` package](http://github.com/haskell/containers)
 
+## [0.6.4.1]
+
+### Bug fixes
+
+* [Replace value-forcing variants of `compose` with lazy variants.](https://github.com/haskell/containers/pull/745)
+  *  This brings `compose` closer in line with functions like `union` and `intersection` which don't evaluate any map values. (Thanks, Simon Jakobi)
+
+### Additions
+
+* [Add `reverseTopSort` to `Data.Graph`](https://github.com/haskell/containers/pull/638) (Thanks, James Parker)
+
+* [Expose `traverseMaybeWithKey` from `Data.IntMap.{Lazy,Strict}`](https://github.com/haskell/containers/pull/743) (Thanks, Simon
+  Jakobi)
+
+### Other changes
+
+* Improvements to the testsuite: [#663](https://github.com/haskell/containers/pull/663), [#662](https://github.com/haskell/containers/pull/662) (Thanks, Bertram Felgenhauer)
+
+* [Fix build with `stack test`](https://github.com/haskell/containers/pull/738) (Thanks, Simon Jakobi)
+
+[0.6.4.1]: https://github.com/haskell/containers/compare/v0.6.3.1-release...v0.6.4.1
+
 ## 0.6.3.1
 
 ### Bug fixes
diff --git a/containers/containers.cabal b/containers/containers.cabal
index 268a98f0e38d24792229183735bb65c06c9a63fa..6ad9a9126ba8e150a8014ec80699744f20f7def6 100644
--- a/containers/containers.cabal
+++ b/containers/containers.cabal
@@ -1,5 +1,5 @@
 name: containers
-version: 0.6.3.1
+version: 0.6.4.1
 license: BSD3
 license-file: LICENSE
 maintainer: libraries@haskell.org
diff --git a/containers/src/Data/Graph.hs b/containers/src/Data/Graph.hs
index 10ff02fbe922cc39043aa50e136d88b8890cfeb6..d558c48fb2467a825bb5c133c3c956f7be8073fe 100644
--- a/containers/src/Data/Graph.hs
+++ b/containers/src/Data/Graph.hs
@@ -619,6 +619,8 @@ topSort      :: Graph -> [Vertex]
 topSort       = reverse . postOrd
 
 -- | Reverse ordering of `topSort`.
+--
+-- @since 0.6.4
 reverseTopSort :: Graph -> [Vertex]
 reverseTopSort = postOrd
 
diff --git a/containers/src/Data/IntMap/Internal.hs b/containers/src/Data/IntMap/Internal.hs
index 5caebcb0f03fe3153f52796fdbd8e8690d00614d..201f17c6d33572f945dd464c32d30dafd43274f1 100644
--- a/containers/src/Data/IntMap/Internal.hs
+++ b/containers/src/Data/IntMap/Internal.hs
@@ -783,7 +783,7 @@ disjoint t1@(Bin p1 m1 l1 r1) t2@(Bin p2 m2 l2 r2)
 -- ('compose' bc ab '!?') = (bc '!?') <=< (ab '!?')
 -- @
 --
--- __Note:__ Prior to UNRELEASED, "Data.IntMap.Strict" exposed a version of
+-- __Note:__ Prior to v0.6.4, "Data.IntMap.Strict" exposed a version of
 -- 'compose' that forced the values of the output 'IntMap'. This version does
 -- not force these values.
 --
@@ -1896,7 +1896,7 @@ traverseMaybeMissing f = WhenMissing
 
 -- | /O(n)/. Traverse keys\/values and collect the 'Just' results.
 --
--- @since UNRELEASED
+-- @since 0.6.4
 traverseMaybeWithKey
   :: Applicative f => (Key -> a -> f (Maybe b)) -> IntMap a -> f (IntMap b)
 traverseMaybeWithKey f = go
diff --git a/containers/src/Data/IntMap/Strict/Internal.hs b/containers/src/Data/IntMap/Strict/Internal.hs
index 7c639ef96027262ffbf5ab6745f983b29b2a4744..8245fd2c69f093dfa552db0bacdf88cec89ba14f 100644
--- a/containers/src/Data/IntMap/Strict/Internal.hs
+++ b/containers/src/Data/IntMap/Strict/Internal.hs
@@ -904,7 +904,7 @@ traverseWithKey f = go
 
 -- | /O(n)/. Traverse keys\/values and collect the 'Just' results.
 --
--- @since UNRELEASED
+-- @since 0.6.4
 traverseMaybeWithKey
   :: Applicative f => (Key -> a -> f (Maybe b)) -> IntMap a -> f (IntMap b)
 traverseMaybeWithKey f = go
diff --git a/containers/src/Data/Map/Internal.hs b/containers/src/Data/Map/Internal.hs
index a12d3c4ab90d5b37eda2a835876a98899e1d4780..e39be0023a176709f57533df8ae5c2df0366857e 100644
--- a/containers/src/Data/Map/Internal.hs
+++ b/containers/src/Data/Map/Internal.hs
@@ -2106,7 +2106,7 @@ disjoint (Bin _ k _ l r) t
 -- ('compose' bc ab '!?') = (bc '!?') <=< (ab '!?')
 -- @
 --
--- __Note:__ Prior to UNRELEASED, "Data.Map.Strict" exposed a version of
+-- __Note:__ Prior to v0.6.4, "Data.Map.Strict" exposed a version of
 -- 'compose' that forced the values of the output 'Map'. This version does not
 -- force these values.
 --