diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,4 +20,4 @@
       - "irc.freenode.org#haskell-lens"
     skip_join: true
     template:
-      - "\x0313lens\x03/\x036%{branch}\x03 \x0314%{commit}\x03 %{build_url} %{message}"
+      - "\x0313lens\x03/\x0306%{branch}\x03 \x0314%{commit}\x03 %{build_url} %{message}"
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,3 +1,20 @@
+3.6.0.4 [maintenance release]
+-------
+* Added support for `test-framework` 0.8
+
+3.6.0.3 [maintenance release]
+-------
+* Added support for `test-framework` 0.7
+
+3.6.0.2 [maintenance release]
+-------
+* Added more explicit dependencies to the doctest suite.
+* Disabled the 'expected failure' quickcheck tests that occasionally would fail with internal QuickCheck errors.
+
+3.6.0.1 [maintenance release]
+-------
+* Added explicit dependency on containers and unordered-containers to the doctest suite
+
 3.6
 -----
 * Added `upon` (along with variants of it) to `Data.Data.Lens`, which can be used to generate a `Traversal` from a field accessor or any function that returns, unmodified,
diff --git a/lens.cabal b/lens.cabal
--- a/lens.cabal
+++ b/lens.cabal
@@ -1,6 +1,6 @@
 name:          lens
 category:      Data, Lenses
-version:       3.6.0.3
+version:       3.6.0.4
 license:       BSD3
 cabal-version: >= 1.8
 license-file:  LICENSE
@@ -276,7 +276,7 @@
     HUnit == 1.2.*,
     lens,
     mtl,
-    test-framework >= 0.6 && < 0.8,
+    test-framework >= 0.6 && < 0.9,
     test-framework-hunit >= 0.2 && < 0.4,
     test-framework-th >= 0.2 && < 0.4
   ghc-options: -w -threaded