diff --git a/Changelog.md b/Changelog.md
index 35d1d3a..7c336e3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,13 +1,16 @@
 version 0.6.0
 --------------
 
-+ TODO
++ GH-28: `StatefulSFTPClient` doesn't cwdify all commands.
++ GH-27: Fixed deadlock condition in `AbstractChannel`.
++ GH-31: Fixed bug in SFTP `FileMode` for AIX/Unix directory mask.
++ GH-34: The option to use an 'upload filter' is back in `SCPUploadClient`.
 
 version 0.5.0
 --------------
 
 + In case of `publickey` authentication using a string rather than a file, prevent private key data from leaking in logs / on authentication exception.
-+ Fix for GH-21 (SessionChannel#changeWindowDimensions was broken)
++ GH-21: SessionChannel#changeWindowDimensions was broken
 + Prevent occasional spurious NPE when disconnecting at AbstractDirectChannel#notifyError.
 + SSHClient implements Closeable.
 + OSGi-fication
@@ -15,7 +18,7 @@ version 0.5.0
 version 0.4.1
 ---------------
 
-+ Fix for GH-18 (intermittent key exchange failures).
++ GH-18: Intermittent key exchange failures.
 + Support for `publickey` authentication from strings.
 
 version 0.4.0