diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5363c30143..afb9ff9022 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,12 +26,12 @@ PROJECT(h2o)
 
 SET(VERSION_MAJOR "2")
 SET(VERSION_MINOR "2")
-SET(VERSION_PATCH "0")
+SET(VERSION_PATCH "1")
 SET(VERSION_PRERELEASE "")
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_PRERELEASE}")
 SET(LIBRARY_VERSION_MAJOR "0")
 SET(LIBRARY_VERSION_MINOR "13")
-SET(LIBRARY_VERSION_PATCH "0")
+SET(LIBRARY_VERSION_PATCH "1")
 SET(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}${VERSION_PRERELEASE}")
 SET(LIBRARY_SOVERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}")
 
diff --git a/Changes b/Changes
index 16574c848b..2de2a4b7b1 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,16 @@
 Revision history for H2O.
 
+2.2.1 2017-04-22 22:43:00+0000
+	- [mruby] correct the line number reported on an exception #1239 #1251 (Ichito Nagata)
+	- [mruby] retain the order of request headers sharing a single name #1271 (Kazuho Oku)
+	- [ssl] fix assertion failure in `decode_ssl_input` #1264 (Kazuho Oku)
+	- [ssl] fix OCSP stapling error when OpenSSL 1.1.0 is used #1270 (Kazuho Oku)
+	- [libh2o] fix crash when abruptly closing an HTTP/2 connection on libuv #1250 (Kazuho Oku)
+	- [libh2o] fix memory leak of `_timestamp_cache` #1255 (Kazuho Oku)
+	- [doc] restore doc of `%{...}e` #1252 (Kazuho Oku)
+	- [doc] fix typo suggesting using `brotli` instead of `br` #1263 (Bogdan Khomutsky)
+	- [misc] fix undefined behaviors detected by ubsan #1246 (Frederik Deweerdt)
+
 2.2.0 2017-04-05 02:18:00+0000
 	- [core] add `crash-handler.wait-pipe-close` parameter #1092 (Frederik Deweerdt)
 	- [core] introduce an option to bypass the `server` header sent from upstream #1226 (Frederik Deweerdt)
diff --git a/include/h2o/version.h b/include/h2o/version.h
index 73e3f89ec6..aed7db86c2 100644
--- a/include/h2o/version.h
+++ b/include/h2o/version.h
@@ -22,14 +22,14 @@
 #ifndef h2o__version_h
 #define h2o__version_h
 
-#define H2O_VERSION "2.2.0"
+#define H2O_VERSION "2.2.1"
 
 #define H2O_VERSION_MAJOR 2
 #define H2O_VERSION_MINOR 2
-#define H2O_VERSION_PATCH 0
+#define H2O_VERSION_PATCH 1
 
 #define H2O_LIBRARY_VERSION_MAJOR 0
 #define H2O_LIBRARY_VERSION_MINOR 13
-#define H2O_LIBRARY_VERSION_PATCH 0
+#define H2O_LIBRARY_VERSION_PATCH 1
 
 #endif