diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63aefbb3723e59b66340135c517b4753b48cbdfc..a13c45aae2619c8ca3c8870c12104c0a93a08542 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,36 @@ This project adheres to Semantic Versioning.
 
 All changes mention the author, unless contributed by me (@derekparker).
 
+## [0.11.0-alpha] 2016-01-26
+
+### Added
+
+- Windows support landed in master. Still work to be done, but %95 the way there. (@lukehoban)
+- `step-instruction` command added, has same behavior of the old `step` command.
+- (Backend) Implementation for conditional breakpoints, front end command coming soon. (@aarzilli)
+- Implement expression evaluator, can now execute commands like `print i == 2`. (@aarzilli)
+
+### Changed
+
+- `step` command no longer steps single instruction but goes to next source line, stepping into functions.
+- Refactor or `parseG` command for clarity and speed improvements.
+- Optimize reading from target process memory with cache. (prefetch + parse) (@aarzilli)
+- Shorten file paths in `trace` output.
+- Added git sha to version output.
+- Support function spec with partial package paths. (@aarzilli)
+- Bunch of misc variable evaluation fixes (@aarzilli)
+
+### Fixed
+
+- Misc fixes in preparation for Go 1.6. (@aarzilli, @derekparker)
+- Replace stdlib debug/dward with golang.org/x/debug/dwarf and fix Dwarf endian related parsing issues. (@aarzilli)
+- Fix `goroutines` not working without an argument. (@aarzilli)
+- Always clear temp breakpoints, even if normal breakpoint is hit. (@aarzilli)
+- Infinite loading loop through maps. (@aarzilli)
+- Fix OSX issues related to CGO memory corruption (array overrun in CGO). (@aarzilli)
+- Fix OSX issue related to reporting multiple breakpoints hit at same time. (@aarzilli)
+- Fix panic when using the `trace` subcommand.
+
 ## [0.10.0-alpha] 2015-10-04
 
 ### Added
diff --git a/cmd/dlv/main.go b/cmd/dlv/main.go
index 945ce92cdbeed433ce7cf7108eb2edf125fdc99d..e6967b64cc92c8eb86c1868e08561c3da7f8550f 100644
--- a/cmd/dlv/main.go
+++ b/cmd/dlv/main.go
@@ -8,10 +8,10 @@ import (
 	"os/exec"
 	"os/signal"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"syscall"
-	"runtime"
 
 	"github.com/derekparker/delve/config"
 	"github.com/derekparker/delve/service"
@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const version string = "0.10.0-alpha"
+const version string = "0.11.0-alpha"
 
 // Build is the current git hash.
 var Build string
@@ -56,13 +56,13 @@ evaluating variables, and providing information of thread / goroutine state, CPU
 The goal of this tool is to provide a simple yet powerful interface for debugging Go programs.
 `,
 	}
-	
+
 	buildFlagsDefault := ""
 	if runtime.GOOS == "windows" {
-		// Work-around for https://github.com/golang/go/issues/13154 
+		// Work-around for https://github.com/golang/go/issues/13154
 		buildFlagsDefault = "-ldflags=-linkmode internal"
 	}
-	
+
 	rootCommand.PersistentFlags().StringVarP(&Addr, "listen", "l", "localhost:0", "Debugging server listen address.")
 	rootCommand.PersistentFlags().BoolVarP(&Log, "log", "", false, "Enable debugging server logging.")
 	rootCommand.PersistentFlags().BoolVarP(&Headless, "headless", "", false, "Run debug server only, in headless mode.")
@@ -259,7 +259,7 @@ starts and attaches to it, and enable you to immediately begin debugging your pr
 				// On Windows, "go test" generates an executable with the ".exe" extension
 				if runtime.GOOS == "windows" {
 					debugname += ".exe"
-				}				
+				}
 				defer os.Remove(debugname)
 				processArgs := append([]string{debugname}, args...)