diff --git a/CHANGELOG.md b/CHANGELOG.md
index 409d2aa81a..04796870f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Use read-only transaction for read requests - @ruslantalpa
 - Include entities from the same parent table using two different foreign keys - @ruslantalpa
 - Ensure that Location header in 201 response is URL-encoded - @league
+- Fix garbage collector CPU leak - @ruslantalpa et al.
 
 ## [0.3.1.1] - 2016-03-28
 
diff --git a/postgrest.cabal b/postgrest.cabal
index c8edd70f47..9a2a83fa26 100644
--- a/postgrest.cabal
+++ b/postgrest.cabal
@@ -24,7 +24,7 @@ Flag CI
 executable postgrest
   main-is:             Main.hs
   default-extensions:  OverloadedStrings, ScopedTypeVariables, QuasiQuotes
-  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
+  ghc-options:         -threaded -rtsopts -with-rtsopts="-N -I2"
   default-language:    Haskell2010
   build-depends:       aeson (>= 0.8 && < 0.10) || (>= 0.11 && < 0.12)
                      , base >= 4.8 && < 5