diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c0e9c0..5e977ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,43 +1,49 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
 - bind to a network interface (rather than an IP/host) with net_iface
 ### Changed
 - upgraded build to rebar3
 ### Deprecated
 ### Removed
 ### Fixed
 ### Security
 
+## [0.8.3] - 2016-08-08
+### Fixed
+- always close ssl sockets as an ssl socket
+- keep listen_socket separate from socket
+- not required to make the socket active to accept connections
+
 ## [0.8.2] - 2016-07-08
 ### Added
 - listener_pool_size configuration option for listeners
 ### Changed
 - Default size of listener pool drops to 10 from 20
 - Rate limit (by introducing a short wait) connection accept()s
 ### Fixed
 - Prevent starvation of the session pool due to clients dropping connections
   pre-accept()
 
 ## [0.8.1] - 2016-07-06
 ### Added
 - ipv6 connections
 ### Changed
 - update to eimap 0.2.5
 ### Fixed
 - Ignore non-listing LIST commands (e.g. requests for the root/separator)
 - Tidy up the server greetings
 
 ## [0.8.0] - 2016-06-08
 ### Added
 - systemd service module
 - sysv init script
 ### Changed
 - Upgraded eimap to 0.2.4
 ### Fixed
 - Support more variations of the LIST command args in the filter_groupware rule
 
diff --git a/apps/kolab_guam/src/kolab_guam.app.src b/apps/kolab_guam/src/kolab_guam.app.src
index b8e3efc..82bce62 100644
--- a/apps/kolab_guam/src/kolab_guam.app.src
+++ b/apps/kolab_guam/src/kolab_guam.app.src
@@ -1,20 +1,20 @@
 %% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
 {application, kolab_guam,
  [
   {description, "IMAP session proxy"},
-  {vsn, "0.8.2"},
+  {vsn, "0.8.3"},
   {registered, []},
   {applications, [
                   kernel,
                   stdlib,
                   compiler,
                   syntax_tools,
                   goldrush,
                   lager,
                   crypto,
                   ssl
                  ]},
   {mod, { kolab_guam, []}},
   {env, [
     ]}
  ]}.
diff --git a/rel/reltool.config b/rel/reltool.config
index e07880b..dc8a260 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -1,51 +1,51 @@
 %% -*- mode: erlang -*-
 %% ex: ft=erlang
 {sys, [
        {lib_dirs, ["../deps"]},
        {erts, [{mod_cond, derived}, {app_file, strip}]},
        {app_file, strip},
-       {rel, "kolab_guam", "0.8.2",
+       {rel, "kolab_guam", "0.8.3",
         [
          kernel,
          stdlib,
          sasl,
          compiler,
          syntax_tools,
          goldrush,
          lager,
          lager_syslog,
          crypto,
          kolab_guam
         ]},
        {rel, "start_clean", "",
         [
          kernel,
          stdlib
         ]},
        {boot_rel, "kolab_guam"},
        {profile, embedded},
        {incl_cond, derived},
        {excl_archive_filters, [".*"]}, %% Do not archive built libs
        {excl_sys_filters, ["^bin/(?!start_clean.boot)",
                            "^erts.*/bin/(dialyzer|typer)",
                            "^erts.*/(doc|info|include|lib|man|src)"]},
        {excl_app_filters, ["\.gitignore"]},
        {app, kolab_guam, [{mod_cond, app}, {incl_cond, include}, {lib_dir, "../apps/kolab_guam"}]}
       ]}.
 
 {target_dir, "kolab_guam"}.
 
 {overlay, [
            {mkdir, "log/sasl"},
            {copy, "files/erl", "\{\{erts_vsn\}\}/bin/erl"},
            {copy, "files/nodetool", "releases/\{\{rel_vsn\}\}/nodetool"},
            {copy, "kolab_guam/bin/start_clean.boot",
                   "\{\{erts_vsn\}\}/bin/start_clean.boot"},
            {copy, "files/kolab_guam", "bin/kolab_guam"},
            {copy, "files/kolab_guam.cmd", "bin/kolab_guam.cmd"},
            {copy, "files/start_erl.cmd", "bin/start_erl.cmd"},
            %% Following line may be safely removed in new projects
            {copy, "files/install_upgrade.escript", "bin/install_upgrade.escript"},
            {copy, "files/sys.config", "releases/\{\{rel_vsn\}\}/sys.config"},
            {copy, "files/vm.args", "releases/\{\{rel_vsn\}\}/vm.args"}
           ]}.