diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d8a13b..89a3368 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 2.8)
 project(reason)
 
 set(PROJECT_MAJOR_VERSION 1)
-set(PROJECT_MINOR_VERSION 1)
-set(PROJECT_PATCH_VERSION 7)
+set(PROJECT_MINOR_VERSION 2)
+set(PROJECT_PATCH_VERSION 0)
 
 set (PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION})
 set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
diff --git a/ChangeLog b/ChangeLog
index 11d6d3b..8d24d5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+v1.2.0
+ o Initial client API (0bd23c9 Mark Ellzey)
+ o updating test_client.c (b53f25f Mark Ellzey)
+ o Added sample chunk callbacks for client (849bddb Mark Ellzey)
+ o Updating test_client.c (081bcfe Mark Ellzey)
+ o Merge from master fixups (97bf2d1 Aaron Stone)
+ o Add test_proxy: example code for using evhtp_client functionality to implement an HTTP reverse proxy. (73fdd0c Aaron Stone)
+ o Add evhtp_kvs_add_kvs / evhtp_headers_add_headers to copy headers from source to dest. (b0aefd4 Aaron Stone)
+ o Update test_proxy: pause the frontend request while processing the backend request; pass headers through with evhtp_headers_add_he
+ o Accept requests like <method> <protocol>://<host> <http version> That is, without an extra / after the host. Consider the path as
+ o Enable search engine for Doxygen. (fa4c9cc Mark Ellzey)
+ o Fixed bug in body-based query checking. (8635b2b Mark Ellzey)
+ o use EVHTP_DISABLE_SSL instead of USE_SSL (5052107 Mark Ellzey)
+ o Fix some generic warnings in test_proxy.c (de206a8 Mark Ellzey)
+ o Add documentation on fallthrough state for method proto. (c1f5216 Mark Ellzey)
+ o (htparse): Properly propagate errors from hook_on_hdrs_begin_run() (1bb641f Marcus Sundberg)
+ o (htparse): Use correct arguments to hook_path_run(). (8aaa419 Marcus Sundberg)
+ o (htparse): Use correct length parameter when calling hooks. (51f78e4 Marcus Sundberg)
+ o (htparse): Handle query parameters according to RFC 3986. (0e7bdcd Marcus Sundberg)
+ o (htparse): Properly handle abolute-URI with empty path. (657fe3b Marcus Sundberg)
+ o (htparse): Use correct arguments to hook_port_run(). (1f60434 Marcus Sundberg)
+ o (htparse): Handle literal IPv6 addresses in URIs. (b495e81 Marcus Sundberg)
+ o (htparse): Fix parsing of ftp and nfs schemes. (9f53ee5 Marcus Sundberg)
+ o (htparse): Avoid memset()ing entire parse buffer on init. (6f1b93f Marcus Sundberg)
+ o (htparse): Add support for CONNECT and PATCH methods. (622256b Marcus Sundberg)
+ o Changed host_ipv6_done state to host_done (93e4f0f Mark Ellzey)
+ o Fixes for multiple requests, new htparse tests (59de92a Mark Ellzey)
+ o evhtp_free now frees all associated callbacks. (34b4261 Mark Ellzey)
+ o Error checking for header_val_add() (c8165a0 Mark Ellzey)
+ o Fix memory leak on hdr_val (a3ccc1e Mark Ellzey)
+ o Added htparser test for empty header keys. (d5c640a Mark Ellzey)
+ o parser fixes / deal with paused responses better. (9d8e243 Mark Ellzey)
+ o Request pausing + threading fixes. (0e774db Mark Ellzey)
+ o Fix format warnings for test_client (680bce6 Mark Ellzey)
+ o rm cruft that got merged in that shouldn't have. (4289914 Mark Ellzey)
+ o Apprently rm'd some critical things, added them back in. (9052e56 Mark Ellzey)
+ o Added -DEVHTP_BUILD_SHARED:STRING=[OFF:ON] (4da6965 Mark Ellzey)
+ o Removed old contrib crap. (cb62ca0 Mark Ellzey)
+ o Fixing the -DEVHTP_BUILD_SHARED:STRING=ON option to only build static-builds or dynamic-builds when set. Avoid mixing and also the
+ o Fix for issues/69 for evthr memset() (f471298 Mark Ellzey)
+ o Browsers can send more trailing data after the application/x-www-form-urlencoded content type, for example, which charset is used.
+ o get_content_len now returns non-modified content_len var (bb6cdac Mark Ellzey)
+ o Added htparser_get_content_pending for fetching bytes left to process. (28710f8 Mark Ellzey)
+
 v1.1.7
  o NULL check for evhtp_kvs_for_each (37f3864 Mark Ellzey)
  o Parse body as the query args if content-type is url-encoded. (ee25209 Mark Ellzey)
diff --git a/evhtp.h b/evhtp.h
index b93ac4f..b2817aa 100644
--- a/evhtp.h
+++ b/evhtp.h
@@ -162,10 +162,10 @@ typedef void (*evhtp_ssl_scache_del)(evhtp_t * htp, unsigned char * sid, int sid
 typedef evhtp_ssl_sess_t * (*evhtp_ssl_scache_get)(evhtp_connection_t * connection, unsigned char * sid, int sid_len);
 typedef void * (*evhtp_ssl_scache_init)(evhtp_t *);
 
-#define EVHTP_VERSION           "1.1.7"
+#define EVHTP_VERSION           "1.2.0"
 #define EVHTP_VERSION_MAJOR     1
-#define EVHTP_VERSION_MINOR     1
-#define EVHTP_VERSION_PATCH     7
+#define EVHTP_VERSION_MINOR     2
+#define EVHTP_VERSION_PATCH     0
 
 #define evhtp_headers_iterator  evhtp_kvs_iterator