diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,8 +1,13 @@
+## 5.2.5
+
+* Setting peer initial window size properly.
+  [#123](https://github.com/kazu-yamamoto/http2/pull/123)
+
 ## 5.2.4
 
 * Update for latest http-semantics
   [#122](https://github.com/kazu-yamamoto/http2/pull/122)
-* 
+* Measuring performance concurrently for h2c-client
 
 ## 5.2.3
 
diff --git a/Network/HTTP2/H2/Context.hs b/Network/HTTP2/H2/Context.hs
--- a/Network/HTTP2/H2/Context.hs
+++ b/Network/HTTP2/H2/Context.hs
@@ -100,7 +100,7 @@
         -- Peer: The spec defines max concurrency is infinite unless
         -- SETTINGS_MAX_CONCURRENT_STREAMS is exchanged.
         -- But it is vulnerable, so we set the limitations.
-        <*> newIORef settings
+        <*> newIORef baseSettings{maxConcurrentStreams = Just defaultMaxStreams}
         <*> newTVarIO emptyOddStreamTable
         <*> newTVarIO (emptyEvenStreamTable cacheSiz)
         <*> newIORef Nothing
@@ -132,20 +132,6 @@
     buflim
         | confBufferSize >= dlim = dlim
         | otherwise = confBufferSize
-
-makeMySettingsList :: Config -> Int -> WindowSize -> [(SettingsKey, Int)]
-makeMySettingsList Config{..} maxConc winSiz = myInitialAlist
-  where
-    -- confBufferSize is the size of the write buffer.
-    -- But we assume that the size of the read buffer is the same size.
-    -- So, the size is announced to via SETTINGS_MAX_FRAME_SIZE.
-    len = confBufferSize - frameHeaderLength
-    payloadLen = max defaultPayloadLength len
-    myInitialAlist =
-        [ (SettingsMaxFrameSize, payloadLen)
-        , (SettingsMaxConcurrentStreams, maxConc)
-        , (SettingsInitialWindowSize, winSiz)
-        ]
 
 ----------------------------------------------------------------
 
diff --git a/http2.cabal b/http2.cabal
--- a/http2.cabal
+++ b/http2.cabal
@@ -1,6 +1,6 @@
 cabal-version:      >=1.10
 name:               http2
-version:            5.2.4
+version:            5.2.5
 license:            BSD3
 license-file:       LICENSE
 maintainer:         Kazu Yamamoto <kazu@iij.ad.jp>