diff --git a/README.md b/README.md
index 92c99d49848..4f7931cd958 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Zcash 2.0.6-rc1
+Zcash 2.0.6
===========
diff --git a/configure.ac b/configure.ac
index bcbe56f9ec3..05b4667e822 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 2)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 6)
-define(_CLIENT_VERSION_BUILD, 25)
+define(_CLIENT_VERSION_BUILD, 50)
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
define(_CLIENT_VERSION_IS_RELEASE, true)
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index af3c93a95d4..ed12564cf6c 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,9 @@
+zcash (2.0.6) stable; urgency=medium
+
+ * 2.0.6 release.
+
+ -- Electric Coin Company Wed, 19 Jun 2019 00:28:06 +0100
+
zcash (2.0.6~rc1) stable; urgency=medium
* 2.0.6-rc1 release.
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 0e9d9d81f18..d770c29fc31 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
---
-name: "zcash-2.0.6-rc1"
+name: "zcash-2.0.6"
enable_cache: true
distro: "debian"
suites:
diff --git a/doc/authors.md b/doc/authors.md
index 9bcdb5ef140..6afdb557cdf 100644
--- a/doc/authors.md
+++ b/doc/authors.md
@@ -1,27 +1,28 @@
Zcash Contributors
==================
-Jack Grigg (863)
-Simon Liu (450)
+Jack Grigg (873)
+Simon Liu (451)
Sean Bowe (278)
-Eirik Ogilvie-Wigley (145)
-Daira Hopwood (115)
+Eirik Ogilvie-Wigley (152)
+Daira Hopwood (124)
Jay Graber (89)
-Wladimir J. van der Laan (81)
+Wladimir J. van der Laan (82)
Taylor Hornby (73)
Jonas Schnelli (62)
Nathan Wilcox (56)
Pieter Wuille (54)
Kevin Gallagher (38)
Cory Fields (35)
+Larry Ruane (23)
Marshall Gaucher (22)
-Larry Ruane (22)
Jonathan "Duke" Leto (17)
syd (15)
Matt Corallo (13)
Paige Peterson (11)
+Marco Falke (11)
Ariel Gabizon (11)
-MarcoFalke (10)
+Jorge Timón (10)
nomnombtc (9)
kozyilmaz (8)
fanquake (8)
@@ -31,20 +32,21 @@ Marius Kjærstad (6)
Luke Dashjr (6)
David Mercer (6)
Daniel Cousens (6)
+Charlie O'Keefe (6)
Suhas Daftuar (5)
-Pavel Janík (5)
+Peter Todd (5)
Karl-Johan Alm (5)
Johnathan Corgan (5)
-Charlie O'Keefe (5)
Alex Morcos (5)
WO (4)
Philip Kaufmann (4)
-Peter Todd (4)
+Pavel Janík (4)
Patrick Strateman (4)
João Barbosa (4)
-Jorge Timón (4)
George Tankersley (4)
Gareth Davies (4)
+Daniel Kraft (4)
+Benjamin Winston (4)
lpescher (3)
ca333 (3)
Per Grön (3)
@@ -52,12 +54,11 @@ Patick Strateman (3)
Jason Davies (3)
James O'Beirne (3)
Dimitris Apostolou (3)
-Daniel Kraft (3)
-Benjamin Winston (3)
Alfie John (3)
rofl0r (2)
mruddy (2)
kpcyrd (2)
+face (2)
aniemerg (2)
UdjinM6 (2)
Scott (2)
@@ -65,8 +66,8 @@ Robert C. Seacord (2)
Pejvan (2)
Pavol Rusnak (2)
Pavel Vasin (2)
-Pavel Janik (2)
Matthew King (2)
+Mary Moore-Simmons (2)
Kaz Wesley (2)
Joe Turgeon (2)
Jack Gavigan (2)
@@ -109,7 +110,6 @@ Nathaniel Mahieu (1)
Murilo Santana (1)
Maxwell Gubler (1)
Matt Quinn (1)
-Mary Moore-Simmons (1)
Mark Friedenbach (1)
Louis Nyffenegger (1)
Leo Arias (1)
diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1
index 1abd7712599..741de3dba72 100644
--- a/doc/man/zcash-cli.1
+++ b/doc/man/zcash-cli.1
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
-.TH ZCASH-CLI "1" "June 2019" "zcash-cli v2.0.6-rc1" "User Commands"
+.TH ZCASH-CLI "1" "June 2019" "zcash-cli v2.0.6" "User Commands"
.SH NAME
-zcash-cli \- manual page for zcash-cli v2.0.6-rc1
+zcash-cli \- manual page for zcash-cli v2.0.6
.SH DESCRIPTION
-Zcash RPC client version v2.0.6\-rc1
+Zcash RPC client version v2.0.6
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see .
diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1
index 3e3c8b2bd13..1353e34a7f4 100644
--- a/doc/man/zcash-tx.1
+++ b/doc/man/zcash-tx.1
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
-.TH ZCASH-TX "1" "June 2019" "zcash-tx v2.0.6-rc1" "User Commands"
+.TH ZCASH-TX "1" "June 2019" "zcash-tx v2.0.6" "User Commands"
.SH NAME
-zcash-tx \- manual page for zcash-tx v2.0.6-rc1
+zcash-tx \- manual page for zcash-tx v2.0.6
.SH DESCRIPTION
-Zcash zcash\-tx utility version v2.0.6\-rc1
+Zcash zcash\-tx utility version v2.0.6
.SS "Usage:"
.TP
zcash\-tx [options] [commands]
diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1
index 2af9ed904a9..491550c9768 100644
--- a/doc/man/zcashd.1
+++ b/doc/man/zcashd.1
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
-.TH ZCASHD "1" "June 2019" "zcashd v2.0.6-rc1" "User Commands"
+.TH ZCASHD "1" "June 2019" "zcashd v2.0.6" "User Commands"
.SH NAME
-zcashd \- manual page for zcashd v2.0.6-rc1
+zcashd \- manual page for zcashd v2.0.6
.SH DESCRIPTION
-Zcash Daemon version v2.0.6\-rc1
+Zcash Daemon version v2.0.6
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see .
diff --git a/doc/release-notes.md b/doc/release-notes.md
index ff7355d93dd..a29094b5174 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -4,24 +4,3 @@ release-notes at release time)
Notable changes
===============
-Debian Stretch is now a Supported Platform
-------------------------------------------
-
-We now provide reproducible builds for Stretch as well as for Jessie.
-
-
-Fixed a bug in ``z_mergetoaddress``
------------------------------------
-
-We fixed a bug which prevented users sending from ``ANY_SPROUT`` or ``ANY_SAPLING``
-with ``z_mergetoaddress`` when a wallet contained both Sprout and Sapling notes.
-
-
-Insight Explorer
-----------------
-
-We have been incorporating changes to support the Insight explorer directly from
-``zcashd``. v2.0.6 includes the first change to an RPC method. If ``zcashd`` is
-run with the flag ``--insightexplorer``` (this requires an index rebuild), the
-RPC method ``getrawtransaction`` will now return additional information about
-spend indices.
diff --git a/doc/release-notes/release-notes-2.0.6.md b/doc/release-notes/release-notes-2.0.6.md
new file mode 100644
index 00000000000..f1beec5117e
--- /dev/null
+++ b/doc/release-notes/release-notes-2.0.6.md
@@ -0,0 +1,102 @@
+Notable changes
+===============
+
+Debian Stretch is now a Supported Platform
+------------------------------------------
+
+We now provide reproducible builds for Stretch as well as for Jessie.
+
+
+Fixed a bug in ``z_mergetoaddress``
+-----------------------------------
+
+We fixed a bug which prevented users sending from ``ANY_SPROUT`` or ``ANY_SAPLING``
+with ``z_mergetoaddress`` when a wallet contained both Sprout and Sapling notes.
+
+
+Insight Explorer
+----------------
+
+We have been incorporating changes to support the Insight explorer directly from
+``zcashd``. v2.0.6 includes the first change to an RPC method. If ``zcashd`` is
+run with the flag ``--insightexplorer``` (this requires an index rebuild), the
+RPC method ``getrawtransaction`` will now return additional information about
+spend indices.
+
+Changelog
+=========
+
+Charlie O'Keefe (1):
+ Add stretch to list of suites in gitian linux descriptors
+
+Daira Hopwood (9):
+ Closes #3992. Remove obsolete warning message.
+ make-release.py: Versioning changes for 2.0.6-rc1.
+ make-release.py: Updated manpages for 2.0.6-rc1.
+ make-release.py: Updated release notes and changelog for 2.0.6-rc1.
+ ld --version doesn't work on macOS.
+ Tweak author aliases.
+ Add coding declaration to zcutil/release-notes.py
+ make-release.py: Versioning changes for 2.0.6.
+ make-release.py: Updated manpages for 2.0.6.
+
+Daniel Kraft (1):
+ Add some const declarations where they are appropriate.
+
+Eirik Ogilvie-Wigley (1):
+ Notable changes for 2.0.6
+
+Eirik Ogilvie-Wigley (7):
+ Fix tree depth in comment
+ Update author aliases
+ Remove old mergetoaddress RPC test
+ Replace CSproutNotePlaintextEntry with SproutNoteEntry to match Sapling
+ z_getmigrationstatus help message wording change
+ Fix z_mergetoaddress sending from ANY_SPROUT/ANY_SAPLING when the wallet contains both note types
+ Clarify what combinations of from addresses can be used in z_mergetoaddress
+
+Jack Grigg (10):
+ Move Equihash parameters into consensus params
+ Globals: Remove Zcash-specific Params() calls from main.cpp
+ Globals: Explicitly pass const CChainParams& to IsStandardTx()
+ Globals: Explicit const CChainParams& arg for main:
+ Globals: Explicitly pass const CChainParams& to ContextualCheckTransaction()
+ Globals: Explicit const CChainParams& arg for main:
+ Globals: Explicitly pass const CChainParams& to DisconnectBlock()
+ Consistently use chainparams and consensusParams
+ Globals: Explicitly pass const CChainParams& to IsInitialBlockDownload()
+ Globals: Explicitly pass const CChainParams& to ReceivedBlockTransactions()
+
+Jorge Timón (6):
+ Globals: Explicit Consensus::Params arg for main:
+ Globals: Make AcceptBlockHeader static (Fix #6163)
+ Chainparams: Explicit CChainParams arg for main (pre miner):
+ Chainparams: Explicit CChainParams arg for miner:
+ Globals: Remove a bunch of Params() calls from main.cpp:
+ Globals: Explicitly pass const CChainParams& to UpdateTip()
+
+Larry Ruane (1):
+ add spentindex to getrawtransaction RPC results
+
+Marco Falke (1):
+ [doc] Fix doxygen comments for members
+
+Mary Moore-Simmons (1):
+ Fixes issue #3504: Changes to --version and adds a couple other useful commands.
+
+Peter Todd (1):
+ Improve block validity/ConnectBlock() comments
+
+Simon Liu (1):
+ Fix typo and clean up help message for RPC z_getmigrationstatus.
+
+Wladimir J. van der Laan (1):
+ Break circular dependency main ↔ txdb
+
+face (2):
+ Pass CChainParams to DisconnectTip()
+ Explicitly pass CChainParams to ConnectBlock
+
+Benjamin Winston (1):
+ Fixes #4013, added BitcoinABC as a disclosure partner
+
diff --git a/src/clientversion.h b/src/clientversion.h
index 5f8b9687026..259d6d4b3e5 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -18,7 +18,7 @@
#define CLIENT_VERSION_MAJOR 2
#define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION 6
-#define CLIENT_VERSION_BUILD 25
+#define CLIENT_VERSION_BUILD 50
//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
diff --git a/src/deprecation.h b/src/deprecation.h
index f581b07e5e1..96ccd2ed717 100644
--- a/src/deprecation.h
+++ b/src/deprecation.h
@@ -8,7 +8,7 @@
// Deprecation policy:
// * Shut down 16 weeks' worth of blocks after the estimated release block height.
// * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
-static const int APPROX_RELEASE_HEIGHT = 549200;
+static const int APPROX_RELEASE_HEIGHT = 553000;
static const int WEEKS_UNTIL_DEPRECATION = 16;
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);
diff --git a/zcutil/release-notes.py b/zcutil/release-notes.py
index 0f9974e8ff3..b1a262232e1 100755
--- a/zcutil/release-notes.py
+++ b/zcutil/release-notes.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
import re, os, os.path
import subprocess
import argparse