diff --git a/CHANGELOG.txt b/CHANGELOG.txt
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.3.2
+------
+- GHC and `bytestring` version compatibility updates.
+
 0.3.1
 ------
 - Use `blaze-textual` on Windows instead of `double-conversion`
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,8 +1,5 @@
 bytestring-conversion
 =====================
 
-[![Build Status](https://travis-ci.org/twittner/bytestring-conversion.svg?branch=master)][1]
-
-Type-classes to convert values to and from `ByteString`.
+Type-classes to convert values to and from textual `ByteString` encodings.
 
-[1]: https://travis-ci.org/twittner/bytestring-conversion
diff --git a/Setup.hs b/Setup.hs
deleted file mode 100644
--- a/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/bytestring-conversion.cabal b/bytestring-conversion.cabal
--- a/bytestring-conversion.cabal
+++ b/bytestring-conversion.cabal
@@ -1,14 +1,13 @@
 name:                bytestring-conversion
-version:             0.3.1
+version:             0.3.2
 synopsis:            Type-classes to convert values to and from ByteString.
 license:             MPL-2.0
 license-file:        LICENSE
 author:              Toralf Wittner
 maintainer:          Toralf Wittner <tw@dtex.org>
 copyright:           (C) 2014-2015 Toralf Wittner
-homepage:            https://github.com/twittner/bytestring-conversion/
-bug-reports:         https://github.com/twittner/bytestring-conversion/issues
-stability:           experimental
+homepage:            https://gitlab.com/twittner/bytestring-conversion
+bug-reports:         https://gitlab.com/twittner/bytestring-conversion/issues
 category:            Data
 build-type:          Simple
 cabal-version:       >= 1.10
@@ -16,16 +15,16 @@
 
 description:
     Defines the type-classes 'ToByteString' and 'FromByteString'
-    to convert values to and from ByteString.
+    to convert values to and from textual 'ByteString' encodings.
 
 source-repository head
-    type:             git
-    location:         git://github.com/twittner/bytestring-conversion.git
+    type:     git
+    location: git@gitlab.com:twittner/bytestring-conversion.git
 
 library
     default-language: Haskell2010
     hs-source-dirs:   src
-    ghc-options:      -Wall -O2 -fwarn-tabs -funbox-strict-fields
+    ghc-options:      -Wall -O2 -fwarn-tabs
 
     exposed-modules:
         Data.ByteString.Conversion
@@ -36,11 +35,11 @@
         Data.ByteString.Conversion.Internal
 
     build-depends:
-        base              >= 4.5    && < 5.0
-      , attoparsec        >= 0.10   && < 1.0
-      , bytestring        >= 0.10.4 && < 1.0
-      , case-insensitive  >= 1.2    && < 2.0
-      , text              >= 0.11   && < 2.0
+        base              >= 4.5     && < 5.0
+      , attoparsec        >= 0.10    && < 1.0
+      , bytestring        >= 0.10.2  && < 1.0
+      , case-insensitive  >= 1.2     && < 2.0
+      , text              >= 0.11    && < 2.0
 
     if os(windows)
         cpp-options:   -DWINDOWS
diff --git a/src/Data/ByteString/Conversion/To.hs b/src/Data/ByteString/Conversion/To.hs
--- a/src/Data/ByteString/Conversion/To.hs
+++ b/src/Data/ByteString/Conversion/To.hs
@@ -16,8 +16,8 @@
 
 import Data.ByteString (ByteString)
 import Data.ByteString.Conversion.Internal
-import Data.ByteString.Lazy.Builder
-import Data.ByteString.Lazy.Builder.Extras hiding (runBuilder)
+import Data.ByteString.Builder
+import Data.ByteString.Builder.Extra hiding (runBuilder)
 import Data.CaseInsensitive (CI, original)
 import Data.Int
 import Data.List (intersperse)