diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a643c59..1418427a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.6.5
+
+* Auto-restart server when server and client versions do not match
+
 ## 1.6.4
 
 * Fix incompatibility with RubyGems 2.6.0.
diff --git a/lib/spring/client/run.rb b/lib/spring/client/run.rb
index 9d994541..1f2bede8 100644
--- a/lib/spring/client/run.rb
+++ b/lib/spring/client/run.rb
@@ -98,12 +98,12 @@ def verify_server_version
         server_version = server.gets.chomp
         if server_version != env.version
           $stderr.puts <<-ERROR
-There is a version mismatch between the spring client and the server.
-You should restart the server and make sure to use the same version.
-
-CLIENT: #{env.version}, SERVER: #{server_version}
+There is a version mismatch between the spring client (#{env.version}) and the server (#{server_version}).
+Restarting to resolve.
 ERROR
-          exit 1
+
+          stop_server
+          cold_run
         end
       end