diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3d70831..b6f04f33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Version History
 
-## Unreleased
+## 1.0.0
 
 * pyenv: Import latest changes from rbenv as of Aug 15, 2016 (#669)
 * pyenv: Add workaround for system python at `/bin/python` (#628)
diff --git a/libexec/pyenv---version b/libexec/pyenv---version
index e29c0e1e..391ca75b 100755
--- a/libexec/pyenv---version
+++ b/libexec/pyenv---version
@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-version="20160726"
+version="1.0.0"
 git_revision=""
 
 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
diff --git a/test/--version.bats b/test/--version.bats
index 25721cfc..11e1663a 100644
--- a/test/--version.bats
+++ b/test/--version.bats
@@ -19,7 +19,7 @@ git_commit() {
   assert [ ! -e "$PYENV_ROOT" ]
   run pyenv---version
   assert_success
-  [[ $output == "pyenv 20"* ]]
+  [[ $output == "pyenv "?.?.? ]]
 }
 
 @test "doesn't read version from non-pyenv repo" {
@@ -30,19 +30,19 @@ git_commit() {
 
   run pyenv---version
   assert_success
-  [[ $output == "pyenv 20"* ]]
+  [[ $output == "pyenv "?.?.? ]]
 }
 
 @test "reads version from git repo" {
   git init
   git remote add origin https://github.com/yyuu/pyenv.git
   git_commit
-  git tag v20380119
+  git tag v0.4.1
   git_commit
   git_commit
 
   run pyenv---version
-  assert_success "pyenv 20380119-2-g$(git rev-parse --short HEAD)"
+  assert_success "pyenv 0.4.1-2-g$(git rev-parse --short HEAD)"
 }
 
 @test "prints default version if no tags in git repo" {
@@ -51,5 +51,5 @@ git_commit() {
   git_commit
 
   run pyenv---version
-  [[ $output == "pyenv 20"* ]]
+  [[ $output == "pyenv "?.?.? ]]
 }