diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a2121e..e39c5fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## master (unreleased)
+## v1.8.0 (2018-04-02)
 
 * The default created user now has the same username as the user starting sshportal (was hardcoded "admin")
 * Add Telnet support
diff --git a/README.md b/README.md
index e904b20..01f581d 100644
--- a/README.md
+++ b/README.md
@@ -239,7 +239,7 @@ An [automated build is setup on the Docker Hub](https://hub.docker.com/r/moul/ss
 ```console
 # Start a server in background
 #   mount `pwd` to persist the sqlite database file
-docker run -p 2222:2222 -d --name=sshportal -v "$(pwd):$(pwd)" -w "$(pwd)" moul/sshportal:v1.7.1
+docker run -p 2222:2222 -d --name=sshportal -v "$(pwd):$(pwd)" -w "$(pwd)" moul/sshportal:v1.8.0
 
 # check logs (mandatory on first run to get the administrator invite token)
 docker logs -f sshportal
@@ -248,7 +248,7 @@ docker logs -f sshportal
 The easier way to upgrade sshportal is to do the following:
 
 ```sh
-# we consider you were using an old version and you want to use the new version v1.7.1
+# we consider you were using an old version and you want to use the new version v1.8.0
 
 # stop and rename the last working container + backup the database
 docker stop sshportal
@@ -256,7 +256,7 @@ docker rename sshportal sshportal_old
 cp sshportal.db sshportal.db.bkp
 
 # run the new version
-docker run -p 2222:2222 -d --name=sshportal -v "$(pwd):$(pwd)" -w "$(pwd)" moul/sshportal:v1.7.1
+docker run -p 2222:2222 -d --name=sshportal -v "$(pwd):$(pwd)" -w "$(pwd)" moul/sshportal:v1.8.0
 # check the logs for migration or cross-version incompabitility errors
 docker logs -f sshportal
 ```
diff --git a/main.go b/main.go
index fe2d9fc..a172bd2 100644
--- a/main.go
+++ b/main.go
@@ -18,7 +18,7 @@ import (
 
 var (
 	// Version should be updated by hand at each release
-	Version = "1.7.1+dev"
+	Version = "1.8.0"
 	// GitTag will be overwritten automatically by the build system
 	GitTag string
 	// GitSha will be overwritten automatically by the build system