diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dc53623..f3d66ed1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Version History
 
+## Unreleased
+
+* python-build: Add CPython 3.6.0 (#787)
+
+
 ## 1.0.5
 
 * python-build: Add CPython 2.7.13 (#782)
diff --git a/plugins/python-build/share/python-build/3.6.0rc2 b/plugins/python-build/share/python-build/3.6.0
similarity index 50%
rename from plugins/python-build/share/python-build/3.6.0rc2
rename to plugins/python-build/share/python-build/3.6.0
index 2924facb..f437983d 100644
--- a/plugins/python-build/share/python-build/3.6.0rc2
+++ b/plugins/python-build/share/python-build/3.6.0
@@ -2,7 +2,7 @@
 install_package "openssl-1.0.2g" "https://www.openssl.org/source/openssl-1.0.2g.tar.gz#b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33" mac_openssl --if has_broken_mac_openssl
 install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 if has_tar_xz_support; then
-  install_package "Python-3.6.0rc2" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0rc2.tar.xz#ed07453330af6677d0a670e187344922a67208fc6bdaea9fade66dc08bf763a4" ldflags_dirs standard verify_py36 ensurepip
+  install_package "Python-3.6.0" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz#b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622" ldflags_dirs standard verify_py36 ensurepip
 else
-  install_package "Python-3.6.0rc2" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0rc2.tgz#1241bec1869883f328d54c28542f352395f21076c5d0e7478c0993e010138c44" ldflags_dirs standard verify_py36 ensurepip
+  install_package "Python-3.6.0" "https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tgz#b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622" ldflags_dirs standard verify_py36 ensurepip
 fi