diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b225a14..fc4705c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## master (unreleased)
+## v1.7.0 (2018-01-02)
 
 Breaking changes:
 * Use `sshportal server` instead of `sshportal` to start a new server (nothing to change if using the docker image)
diff --git a/README.md b/README.md
index 7476ba25..9a454c40 100644
--- a/README.md
+++ b/README.md
@@ -228,7 +228,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.6.0
+docker run -p 2222:2222 -d --name=sshportal -v "$(pwd):$(pwd)" -w "$(pwd)" moul/sshportal:v1.7.0
 
 # check logs (mandatory on first run to get the administrator invite token)
 docker logs -f sshportal
@@ -237,7 +237,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.6.0
+# we consider you were using an old version and you want to use the new version v1.7.0
 
 # stop and rename the last working container + backup the database
 docker stop sshportal
@@ -245,7 +245,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.6.0
+docker run -p 2222:2222 -d --name=sshportal -v "$(pwd):$(pwd)" -w "$(pwd)" moul/sshportal:v1.7.0
 # check the logs for migration or cross-version incompabitility errors
 docker logs -f sshportal
 ```
diff --git a/main.go b/main.go
index de07f6d7..bbdcaa7b 100644
--- a/main.go
+++ b/main.go
@@ -21,7 +21,7 @@ import (
 
 var (
 	// Version should be updated by hand at each release
-	Version = "1.6.0+dev"
+	Version = "1.7.0"
 	// GitTag will be overwritten automatically by the build system
 	GitTag string
 	// GitSha will be overwritten automatically by the build system