diff --git a/AUTHORS b/AUTHORS
index 6642174..5bc336e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,6 +26,7 @@ Patches and Suggestions
 - Leila Muhtasib
 - Richard Fearn
 - Jesús Espino
+- Rémy HUBSCHER
 - go2null
 - Andrew Janke
 - David Baumgold
@@ -39,29 +40,33 @@ Patches and Suggestions
 - grindhold
 - Aggelos Orfanakos
 - Camille Reynders
+- Carlos Prado
 - Chris Hall
 - Damian Krzeminski
 - NANRI
 - Alexander Krasnukhin
 - Phally
 - Rico Sta. Cruz
-- Rémy HUBSCHER
 - Takuma Yamaguchi
+- vr8ce
 - Brian J Brennan
 - Hogan Long
 - Ivan Malopinsky
 - Jonathan "Duke" Leto
 - Julio Napurí
+- Justin Dugger
 - Nils Winkler
 - Philipp Klose
 - Richard Russon
 - Sam Bostock
 - gisphm
 - jacobherrington
+- phigoro
 - wooorm
 - Alexis GRIMALDI
 - Allan Odgaard
 - Andre Cerqueira
+- Brice Dutheil
 - Curtis McEnroe
 - David Rogers
 - Devin Withers
@@ -86,7 +91,7 @@ Patches and Suggestions
 - Wil Moore III
 - William Montgomery
 - Ye Lin Aung
-- phigoro
+- luozexuan
 - roxchgt
 - soffolk
 - Abdullah
@@ -96,6 +101,7 @@ Patches and Suggestions
 - Alex McHale
 - Amir Tocker
 - Ammar Najjar
+- Amory Meltzer
 - Andreas Duering
 - Andrei Petcu
 - Andrew Griffiths
@@ -110,8 +116,8 @@ Patches and Suggestions
 - Brandon Zylstra
 - Brian Goad
 - Brian Murrell
-- Brice Dutheil
 - Bruno Sutic
+- Caleb Maclennan
 - Carl Casbolt
 - Carlos Rodríguez
 - Christophe Badoit
@@ -150,7 +156,6 @@ Patches and Suggestions
 - John Hoffmann
 - Jon Ander Peñalba
 - Joshua Appelman
-- Justin Dugger
 - Kevin Woo
 - Konstantin Schukraft
 - Leandro López
@@ -209,6 +214,7 @@ Patches and Suggestions
 - meza
 - neydroid
 - nulltask
+- sgleizes
 - tiemonl
 - zentarul
 - zeroDivisible
diff --git a/History.md b/History.md
index a8dbb1d..2671824 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,62 @@
 
+6.0.0 / 2020-06-22
+==================
+
+  * doc: remove gitter
+  * git-cp: remove trailing space
+  * Merge pull request #849 from vr8hub/undodoc
+  * Merge pull request #850 from vr8hub/newundo
+  * Tighten numeric regex
+  * Cleanup code
+  * Modify to work when only a single commit, add parameter checks
+  * Correct undo documentation to match code order of parameters
+  * Merge pull request #847 from Amorymeltzer/patch-1
+  * docs: Note flag for git extra --version
+  * Merge pull request #846 from spacewander/note
+  * doc: add a note about the package maintainer.
+  * Merge pull request #844 from ihoro/installation-via-freebsd-pkg
+  * Merge pull request #843 from spacewander/remove_git_feature
+  * break change: remove docs and other stuff of git-feature's alias
+  * Merge pull request #845 from alerque/remove-feature-aliases
+  * Remove scripts that are mere alias wrappers for git-feature
+  * docs: mention installation via FreeBSD pkg
+  * Merge pull request #840 from spacewander/archive-invalid
+  * Merge pull request #841 from sgleizes/bugfix/git-release-zsh-completion
+  * Fix missing newline escapes in git-release zsh completion
+  * git-archive-file: rename invalid chars in the output filename
+  * Merge pull request #837 from jldugger/jldugger/pr-remote-default
+  * Merge pull request #836 from jldugger/jldugger/feature-config
+  * add a default for the remote to fetch a pr from
+  * add a config setting for prefix
+  * Merge pull request #829 from cpradog/master
+  * update zsh completion for bug and refactor commands
+  * updated zsh completion script
+  * updated git-feature documentation
+  * add squash option to git-feature
+  * add squash option to git-feature
+  * Merge pull request #826 from Natim/feature/825/add-git-cp
+  * Simplify the code.
+  * Signal if the destination already exists.
+  * @spacewander review.
+  * Merge pull request #827 from Natim/fix-man-page-for-git-psykorebase
+  * Fix checks.
+  * Update man page export for git-psykorebase with ronn-ng 0.9.0
+  * @mschneiderwind review.
+  * Add documentation.
+  * Add first version of git-cp
+  * Merge pull request #824 from mapitman/master
+  * Fix documentation for git-browse
+  * Merge pull request #823 from mapitman/master
+  * Implement suggested changes from code review
+  * Add git-browse command
+  * Merge pull request #820 from spacewander/deprecate_git_back
+  * change: deprecate git-back
+  * Merge pull request #817 from bric3/adds-git-brv
+  * Fixes #770: Adds git-brv
+  * Merge pull request #816 from spacewander/git-sed-pathspec
+  * git-sed: limit paths via pathspec
+  * Bump version to 5.2.0-dev.
+
 5.1.0 / 2019-12-21
 ==================
 
diff --git a/bin/git-extras b/bin/git-extras
index a661e95..94d16c2 100755
--- a/bin/git-extras
+++ b/bin/git-extras
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="5.2.0-dev"
+VERSION="6.0.0"
 INSTALL_SCRIPT="https://raw.githubusercontent.com/tj/git-extras/master/install.sh"
 
 update() {