diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbf5ea8af..5c060b5f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,12 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.6.0] - 2017-12-14
 
 ### Added
 
-- Socket node-type support for Unix Domain Sockets
-- Protobuf io format
+- New node-types:
+  - `iec61850-9-2` for IEC 61850 Sampled Values
+  - `amqp` for RabbitMQ
+- New IO formats:
+  - Google `protobuf`
+- Added support for Unix Domain Sockets to `socket` node-type
 - Python example client using new Protobuf and UDP/Unix sockets
 
 ### Changed
@@ -18,10 +22,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Upgraded Docker build containers to Fedora 27
 - Updated submodules for most dependencies
 - Use "LABEL" instead of "MAINTAINER" keyword in Dockerfiles
+- Removed VILLASfpga related code into external library
+  - `libxil` dependency is dropped
 
 ### Fixed
 
 - Socket node-type supports now arbirarily sized packets
+- Netem support is working again
 
 ## [0.5.1] - 2017-10-23