diff --git a/AUTHORS b/AUTHORS
index 7f1cb7a5..cd59cf4c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,5 @@
 Yaroslav Pogrebnyak <yyyaroslav@gmail.com>
+Illarion Kovalchuk <illarion.kovalchuk@gmail.com>
 Ievgen Ponomarenko <kikomdev@gmail.com>
 Nick Doikov <Nick.Doikov@gmail.com>
+Seua Polyakov <ctrlok@gmail.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce3112a4..d7444933 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+## [0.4.0] - 2017-04-07
+This release brings many new features and improvemets, as well as bugfixes.
+Major things are UDP support, TLS termination, TLS proxy, SNI-aware balancing.
+
+### New Features
+- UDP protocol support
+- TLS termination
+- TLS proxy (connect to backends with TLS and configurable certs)
+- SNI-aware balancing (routing based on hostname from TLS Server Name Indication record)
+
+### Added
+- Possibility to enable CORS for REST API
+
+### Fixed
+- Messed up `client_idle_timeout` and `backend_idle_timeout`
+- Bugs in balancers: iphash, roundrobin, weight - now work more accurately
+- Goroutine/memory leak caused by consul discovery not reusing http client
+
+### Changed
+- Docker discovery now can have empty TLS certificates.
+- Migrated to golang 1.8. Now it's minimal requirement for the build.
+
+
+
 ## [0.3.0] - 2016-08-18
 This release brings several new features and improvemets, as well as bugfixes. Major things are
 integrations with Consul, more flexible command-line options and Access control module.
@@ -24,6 +48,7 @@ integrations with Consul, more flexible command-line options and Access control
 - Replaced big.Int with uint64 for simplicity and performance reasons.
 
 
+
 ## [0.2.0] - 2016-07-22
 This release brings several big features such as full-functional REST API and Stats, as well
 as may bugfixes and improvements. All changes are backward-compatible with 0.1.0.
@@ -35,12 +60,12 @@ as may bugfixes and improvements. All changes are backward-compatible with 0.1.0
 ### Added
 - Set GOMAXPROCS to cpu count automatically if no env var is present
 - Added TLS support for Docker discovery
-- Added docker_container_host_env_var property to Docker discovery
+- Added `docker_container_host_env_var` property to Docker discovery
 - Allow any type of value (int or string) in port in JSON discovery
 - Make healthchecks optional
 
 ### Fixed
-- Fixed panic runtime error exec discovery when exec_command is not valid path and timeout=0
+- Fixed panic runtime error exec discovery when `exec_command` is not valid path and timeout=0
 - Fixed roundrobin balance strategy
 - Fixed how SRV discovery handler large UDP responses; Fixed sometimes missed port.
 - Fixed parsing backend on windows (with \r newlines)
diff --git a/Makefile b/Makefile
index da865cd9..c53e1d40 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ uninstall:
 	rm -f ${DESTDIR}/etc/${NAME}.toml
 
 authors:
-	@git log --format='%aN <%aE>' | LC_ALL=C.UTF-8 sort | uniq -c | sort -nr | sed "s/^ *[0-9]* //g" > AUTHORS
+	@git log --format='%aN <%aE>' | LC_ALL=C.UTF-8 sort | uniq -c -i | sort -nr | sed "s/^ *[0-9]* //g" > AUTHORS
 	@cat AUTHORS
 
 clean-deps:
diff --git a/VERSION b/VERSION
index 68d298f0..1d0ba9ea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.0+dev
+0.4.0