diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# 0.4.x
+
+## 0.3.5.1 -> 0.4.0.0
+
+`cassava` was bumped from `0.4.*` to `0.5.*`.
+
+There were some semantic changes going from cassava 0.4.* -> 0.5.*, see here
+
+But I don't think they muddle with any of the explicit cassava-conduit semantics:
+
+- `QuoteMinimal` semantics are not defined by `cassava-conduit`, so it will change behaviour, but 
+- `cassava-conduit` won't compensate for it (hence the bump from `0.3` to `0.4`).
+- It doesn't use `foldl'`
+- cassava-conduit doesn't use `encodeByNamedWith` so the `encIncludeHeader` flag shouldn't have any effect.
+
 # 0.3.x
 
 ## 0.2.2 -> 0.3.0
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -59,19 +59,11 @@
 ## Building the project
 
 ``` Shell
-make build
+./mafia build
 ```
 
 ## Running Unit Tests
 
 ``` Shell
-make test
+./mafia test
 ```
-
-## Running Benchmarks
-
-**After** running `cabal configure --enable-benchmarks` and `cabal build`, the following command will run the benchmarks:
-
-    cabal bench
-
-For newer versions of `cabal`, `cabal bench` will run a `cabal build` automatically if necessary..
diff --git a/cassava-conduit.cabal b/cassava-conduit.cabal
--- a/cassava-conduit.cabal
+++ b/cassava-conduit.cabal
@@ -1,10 +1,10 @@
 name:               cassava-conduit
-version:            0.3.5.1
+version:            0.4.0.0
 license:            BSD3
 license-file:       etc/LICENCE.md
 author:             Dom De Re
 maintainer:         Dom De Re
-copyright:          Copyright (C) 2014-2016 Dom De Re
+copyright:          Copyright (C) 2014-2017 Dom De Re
 synopsis:           Conduit interface for cassava package
 category:           Data
 description:        Conduit interface for cassava package
@@ -34,7 +34,7 @@
                     ,   array
                     ,   bifunctors              >= 4.2           && < 6
                     ,   bytestring              == 0.10.*
-                    ,   cassava                 == 0.4.*
+                    ,   cassava                 == 0.5.*
                     ,   conduit                 == 1.2.*
                     ,   conduit-extra           == 1.1.*
                     ,   mtl                     == 2.2.*
@@ -60,10 +60,10 @@
 
     build-depends:      base                >= 4 && < 5
                       , bytestring          == 0.10.*
-                      , cassava             == 0.4.*
+                      , cassava             == 0.5.*
                       , conduit             == 1.2.*
                       , conduit-extra       == 1.1.*
-                      , QuickCheck          == 2.9.*
+                      , QuickCheck          == 2.10.*
                       , text                == 1.2.*
                       , cassava-conduit