diff --git a/Changelog b/Changelog
index 52a9e53..68731aa 100644
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,8 @@
 WALinuxAgent                                                          Changelog
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2014, WALinuxAgent 2.0.6
-
+13 Jun 2014, WALinuxAgent 2.0.6
+   . Add support for Gentoo
+   . Multiple fixes for extension handler in status report and heartbeat
 
 19 May 2014, WALinuxAgent 2.0.5
    . Multiple fixes for FreeBSD provisioning
diff --git a/waagent b/waagent
index da1cb5b..ecba501 100644
--- a/waagent
+++ b/waagent
@@ -78,7 +78,7 @@ if not hasattr(subprocess,'check_output'):
     
 GuestAgentName = "WALinuxAgent"
 GuestAgentLongName = "Windows Azure Linux Agent"
-GuestAgentVersion = "WALinuxAgent-2.0.6-PRE"
+GuestAgentVersion = "WALinuxAgent-2.0.6"
 ProtocolVersion = "2012-11-30" #WARNING this value is used to confirm the correct fabric protocol.
 
 Config = None