diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index b0037b9..aa69555 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,3 +1,90 @@
+# 2.6.0
+
+* rebar/203: [Pluggable proto compilers gpb](https://github.com/rebar/rebar/pull/203)
+* rebar/273: [Use target_dir as source of new version in generate-appups](https://github.com/rebar/rebar/pull/273)
+* rebar/293: [Check C source dependencies in needs_compile](https://github.com/rebar/rebar/pull/293)
+* rebar/305: [Fix compiler invocation on multiarch Linux](https://github.com/rebar/rebar/pull/305)
+* rebar/322: [Treat vsn mismatch as warning if -k/--keep-going](https://github.com/rebar/rebar/pull/322)
+* rebar/336: [Add details on Dialyzer with "make check"](https://github.com/rebar/rebar/pull/336)
+* rebar/337: [Implement eflame -p/--profile support](https://github.com/rebar/rebar/pull/337)
+* rebar/338: [Processing .app.src.script expects a single value to be returned.](https://github.com/rebar/rebar/pull/338)
+* rebar/344: [Manually clean up paths.](https://github.com/rebar/rebar/pull/344)
+* rebar/351: [fish shell completions for rebar](https://github.com/rebar/rebar/pull/351)
+* rebar/352: [Add typer target (rebase of #309)](https://github.com/rebar/rebar/pull/352)
+* rebar/354: [compiler respects 'keep_going' flag](https://github.com/rebar/rebar/pull/354)
+* rebar/355: [Fix 'make build_plt'](https://github.com/rebar/rebar/pull/355)
+* rebar/356: [Fix minor typo in CONTRIBUTING.md](https://github.com/rebar/rebar/pull/356)
+* rebar/360: [Minor follow-up fixes for #293](https://github.com/rebar/rebar/pull/360)
+* rebar/368: [Escape more characters in path (fix #367)](https://github.com/rebar/rebar/pull/368)
+* rebar/371: [Fix cover print truncation when coverage is 100%](https://github.com/rebar/rebar/pull/371)
+* rebar/372: [Implement eval command via nodetool](https://github.com/rebar/rebar/pull/372)
+* rebar/376: [Remove check adding ebin to path for edoc target](https://github.com/rebar/rebar/pull/376)
+* rebar/378: [deps: fix delete-deps if deps_dir ends with dot](https://github.com/rebar/rebar/pull/378)
+* rebar/382: [Adapt dialyzer_reference to ba466e2d changes](https://github.com/rebar/rebar/pull/382)
+* rebar/385: [Fix Dialyzer warning introduced in 0caf047f](https://github.com/rebar/rebar/pull/385)
+* rebar/386: [Recompile .proto files with gpb also with prefix/suffix](https://github.com/rebar/rebar/pull/386)
+* rebar/386: [Recompile .proto files with gpb also with prefix/suffix](https://github.com/rebar/rebar/pull/386)
+* rebar/386: [Recompile .proto files with gpb also with prefix/suffix](https://github.com/rebar/rebar/pull/386)
+* rebar/399: [Increase the timeout for the inttest/proto_gpb](https://github.com/rebar/rebar/pull/399)
+* rebar/400: [add Emacs/vi header to non-dummy test modules](https://github.com/rebar/rebar/pull/400)
+* rebar/403: [Update reference to installation notes](https://github.com/rebar/rebar/pull/403)
+* rebar/404: [Consistently format export attributes](https://github.com/rebar/rebar/pull/404)
+* rebar/405: [Generate cachegrind file if erlgrind is available](https://github.com/rebar/rebar/pull/405)
+* rebar/406: [Fix deps path check in rebar_ct:collect_glob/3](https://github.com/rebar/rebar/pull/406)
+* rebar/408: [Fix/remove duplicate console message](https://github.com/rebar/rebar/pull/408)
+* rebar/411: [Fix app.config argument passing when using ct_run (take 2)](https://github.com/rebar/rebar/pull/411)
+* rebar/413: [Revert "Merge pull request #386 ... gpb-recompilation...detection"](https://github.com/rebar/rebar/pull/413)
+* rebar/418: [Fix #415 (reltool vsn check)](https://github.com/rebar/rebar/pull/418)
+* rebar/420: [Mock gpb and protobuffs, in inttest, replacing external dependencies](https://github.com/rebar/rebar/pull/420)
+* rebar/421: [inttest/ct3: fix travis-ci breakage](https://github.com/rebar/rebar/pull/421)
+* rebar/424: [Gpb recompilation detection (using base compiler)](https://github.com/rebar/rebar/pull/424)
+* rebar/425: [Copy instead of rsync gpb and protobuffs inttest mocks](https://github.com/rebar/rebar/pull/425)
+* rebar/426: [Fixed #133. Release upgrade now handle long and short names properly.](https://github.com/rebar/rebar/pull/426)
+* rebar/428: [Remove a git url in gpb and protobuffs inttest configs](https://github.com/rebar/rebar/pull/428)
+* rebar/430: [Exit with proper status code if 'eval' fails](https://github.com/rebar/rebar/pull/430)
+* rebar/432: [Document recursive_cmds in -r help string as well](https://github.com/rebar/rebar/pull/432)
+* rebar/433: [inttest/ct3: fix overlong line](https://github.com/rebar/rebar/pull/433)
+* rebar/437: [Fix .app.src.script bug introduced in b44b4f4](https://github.com/rebar/rebar/pull/437)
+* rebar/440: [Delete obsolete file](https://github.com/rebar/rebar/pull/440)
+* rebar/442: [.travis.yml: print information before running script](https://github.com/rebar/rebar/pull/442)
+* rebar/444: [Fix incorrect "not an app dir" warning](https://github.com/rebar/rebar/pull/444)
+* rebar/445: [rebar doesn't respect the order of erl_first_files given in the rebar.conf file](https://github.com/rebar/rebar/pull/445)
+* rebar/447: [Support custom protobuf directory](https://github.com/rebar/rebar/pull/447)
+* rebar/449: [Support .appup.src files](https://github.com/rebar/rebar/pull/449)
+* rebar/452: [added 'shell' command to bash-completion](https://github.com/rebar/rebar/pull/452)
+* rebar/456: [Generate json output from cover](https://github.com/rebar/rebar/pull/456)
+* rebar/458: [Change env var delimiter to match non-word](https://github.com/rebar/rebar/pull/458)
+* rebar/459: [Remove -m64 flag.](https://github.com/rebar/rebar/pull/459)
+* rebar/460: [Add Dialyzer plugin](https://github.com/rebar/rebar/pull/460)
+* rebar/461: [Fix OTP .appup.src processing on empty lists](https://github.com/rebar/rebar/pull/461)
+* rebar/463: [Print more info when profiling](https://github.com/rebar/rebar/pull/463)
+* rebar/466: [Improve test targets in Makefile](https://github.com/rebar/rebar/pull/466)
+* rebar/467: [Refactor logic and optimizations in rebar_erlc_compiler:doterl_compile/4](https://github.com/rebar/rebar/pull/467)
+* rebar/469: [Fix dialyzer warnings](https://github.com/rebar/rebar/pull/469)
+* rebar/470: [Fix whitespace errors](https://github.com/rebar/rebar/pull/470)
+* rebar/471: [Fix whitespace errors](https://github.com/rebar/rebar/pull/471)
+* rebar/475: [Adapt to 18.x time api changes](https://github.com/rebar/rebar/pull/475)
+* rebar/477: [Enable parse transformations in rebar config](https://github.com/rebar/rebar/pull/477)
+* rebar/478: [bootstrap: better warning fix (Thanks James Fish)](https://github.com/rebar/rebar/pull/478)
+* rebar/482: [Windows runner - CD to node root](https://github.com/rebar/rebar/pull/482)
+* rebar/484: [/me added to THANKS](https://github.com/rebar/rebar/pull/484)
+* rebar/485: [avoid pre-compile time errors in expand_include_lib_path](https://github.com/rebar/rebar/pull/485)
+* rebar/487: [erlc: fix recently introduced whitespace errors](https://github.com/rebar/rebar/pull/487)
+* rebar/489: [Fix crash on failed build console output](https://github.com/rebar/rebar/pull/489)
+* rebar/494: [Update line number of allowed dialyzer error](https://github.com/rebar/rebar/pull/494)
+* rebar/496: [Update PLT detail for make build_plt](https://github.com/rebar/rebar/pull/496)
+* rebar/499: [Try one more location for the OTP_VERSION file](https://github.com/rebar/rebar/pull/499)
+* rebar/500: [Makefile: clean only .rebar/erlcinfo](https://github.com/rebar/rebar/pull/500)
+* rebar/502: [Don't crash if missing OTP_VERSION file (fix #350)](https://github.com/rebar/rebar/pull/502)
+* rebar/504: [Drop `shared` PLTs support and change PLT name to <OTP-VSN>.plt](https://github.com/rebar/rebar/pull/504)
+* rebar/505: [rebar_utils: explain pdict use](https://github.com/rebar/rebar/pull/505)
+* rebar/508: [rebar_core: add missing newline in log msg](https://github.com/rebar/rebar/pull/508)
+* rebar/509: [erlc: do not crash if dep file cannot be found](https://github.com/rebar/rebar/pull/509)
+* rebar/510: [Fix 'make deps'](https://github.com/rebar/rebar/pull/510)
+* rebar/511: [Add and use memoization server](https://github.com/rebar/rebar/pull/511)
+* rebar/512: [rmemo: properly handle unsupported call](https://github.com/rebar/rebar/pull/512)
+
+
 # Rebar 2.5.1
 
 * rebar/299: [Fix OS X resource fork handling (Reported-by: Richard O'Keefe)](https://github.com/rebar/rebar/pull/299)
diff --git a/ebin/rebar.app b/ebin/rebar.app
index 975fabc..152829d 100644
--- a/ebin/rebar.app
+++ b/ebin/rebar.app
@@ -3,7 +3,7 @@
 
 {application, rebar,
  [{description, "Rebar: Erlang Build Tool"},
-  {vsn, "2.5.1"},
+  {vsn, "2.6.0"},
   {modules, [ rebar,
               rebar_abnfc_compiler,
               rebar_app_utils,