From db75d9496129a22ccc1bd6addd57cd4354942df3 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Mon, 6 Feb 2017 18:43:11 -0500
Subject: [PATCH] Added release version and changelist

---
 CHANGELOG      | 10 ++++++++++
 CMakeLists.txt |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9051703cb..24ed5ea73 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+2.1.1 (2017-02-06)
+=========================
+
+- Enabled HTTP plugin build; plugin is disabled by default and limited to localhost [#147]
+- Escape HTML in dialog boxes [#247]
+- Corrected crashes in favicon download and password generator [#233, #226]
+- Increase font size of password meter [#228]
+- Fixed compatibility with Qt 5.8 [#211]
+- Use consistent button heights in password generator [#229]
+
 2.1.0 (2017-01-22)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fd890e01..3b5df29b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,8 +38,8 @@ option(WITH_XC_AUTOTYPE "Include Autotype." OFF)
 option(WITH_XC_HTTP "Include KeePassHTTP." OFF)
 option(WITH_XC_YUBIKEY "Include Yubikey support." OFF)
 
-set(KEEPASSXC_VERSION "2.1.0")
-set(KEEPASSXC_VERSION_NUM "2.1.0")
+set(KEEPASSXC_VERSION "2.1.1")
+set(KEEPASSXC_VERSION_NUM "2.1.1")
 
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)