diff --git a/ChangeLog.md b/ChangeLog.md
new file mode 100644
--- /dev/null
+++ b/ChangeLog.md
@@ -0,0 +1,3 @@
+## 2.3.0
+
+* Move from blaze-builder to `Data.ByteString.Builder` [#55](https://github.com/kazu-yamamoto/logger/pull/55)
diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+## fast-logger
+
+A fast logging system
diff --git a/System/Log/FastLogger/IO.hs b/System/Log/FastLogger/IO.hs
--- a/System/Log/FastLogger/IO.hs
+++ b/System/Log/FastLogger/IO.hs
@@ -1,14 +1,9 @@
-{-# LANGUAGE BangPatterns, CPP #-}
+{-# LANGUAGE BangPatterns #-}
 
 module System.Log.FastLogger.IO where
 
-#if MIN_VERSION_bytestring(0,10,2)
 import Data.ByteString.Builder.Extra (Next(..))
 import qualified Data.ByteString.Builder.Extra as BBE
-#else
-import Blaze.ByteString.Builder.Internal.Types (Builder(..), BuildSignal(..), BufRange(..), runBuildStep, buildStep)
-import Foreign.Ptr (minusPtr)
-#endif
 import Data.ByteString.Internal (ByteString(..))
 import Data.Word (Word8)
 import Foreign.ForeignPtr (withForeignPtr)
@@ -31,7 +26,6 @@
 freeBuffer :: Buffer -> IO ()
 freeBuffer = free
 
-#if MIN_VERSION_bytestring(0,10,2)
 toBufIOWith :: Buffer -> BufSize -> (Buffer -> Int -> IO ()) -> Builder -> IO ()
 toBufIOWith buf !size io builder = loop $ BBE.runBuilder builder
   where
@@ -46,25 +40,3 @@
              Chunk (PS fptr off siz) writer'
                | len == 0  -> loop writer' -- flushing
                | otherwise -> withForeignPtr fptr $ \ptr -> io (ptr `plusPtr` off) siz
-#else
-toBufIOWith :: Buffer -> BufSize -> (Buffer -> Int -> IO ()) -> Builder -> IO ()
-toBufIOWith buf !size io (Builder build) = loop firstStep
-  where
-    firstStep = build (buildStep finalStep)
-    finalStep (BufRange p _) = return $ Done p ()
-    bufRange = BufRange buf (buf `plusPtr` size)
-    loop step = do
-        signal <- runBuildStep step bufRange
-        case signal of
-             Done ptr _ -> io buf (ptr `minusPtr` buf)
-             BufferFull minSize ptr next
-               | size < minSize -> error "toBufIOWith: BufferFull: minSize"
-               | otherwise      -> do
-                   io buf (ptr `minusPtr` buf)
-                   loop next
-             InsertByteString ptr (PS fptr off siz) next -> do
-                 io buf (ptr `minusPtr` buf)
-                 withForeignPtr fptr $ \p -> io (p `plusPtr` off) siz
-                 loop next
-#endif
-
diff --git a/System/Log/FastLogger/LogStr.hs b/System/Log/FastLogger/LogStr.hs
--- a/System/Log/FastLogger/LogStr.hs
+++ b/System/Log/FastLogger/LogStr.hs
@@ -11,13 +11,8 @@
   , (<>)
   ) where
 
-#if MIN_VERSION_bytestring(0,10,2)
 import Data.ByteString.Builder (Builder)
 import qualified Data.ByteString.Builder as B
-#else
-import qualified Blaze.ByteString.Builder as BB
-import Blaze.ByteString.Builder.Internal.Types as BB (Builder(..))
-#endif
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Char8 as S8
 import Data.ByteString.Internal (ByteString(..))
@@ -40,18 +35,10 @@
 #endif
 
 toBuilder :: ByteString -> Builder
-#if MIN_VERSION_bytestring(0,10,2)
 toBuilder = B.byteString
-#else
-toBuilder = BB.fromByteString
-#endif
 
 fromBuilder :: Builder -> ByteString
-#if MIN_VERSION_bytestring(0,10,2)
 fromBuilder = BL.toStrict . B.toLazyByteString
-#else
-fromBuilder = BB.toByteString
-#endif
 
 ----------------------------------------------------------------
 
diff --git a/fast-logger.cabal b/fast-logger.cabal
--- a/fast-logger.cabal
+++ b/fast-logger.cabal
@@ -1,5 +1,5 @@
 Name:                   fast-logger
-Version:                2.2.3
+Version:                2.3.0
 Author:                 Kazu Yamamoto <kazu@iij.ad.jp>
 Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp>
 License:                BSD3
@@ -9,6 +9,7 @@
 Category:               System
 Cabal-Version:          >= 1.8
 Build-Type:             Simple
+extra-source-files:     README.md ChangeLog.md
 
 Library
   GHC-Options:          -Wall
@@ -21,9 +22,8 @@
   Build-Depends:        base >= 4 && < 5
                       , array
                       , auto-update >= 0.1.2
-                      -- FIXME: blaze-builder should be removed someday
-                      , blaze-builder
                       , bytestring
+                      , bytestring-builder
                       , directory
                       , filepath
                       , text