diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0248a146601..71972fc7ac1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,7 @@ With this release the systemd configuration files for InfluxDB will use the syst
 - [#6942](https://github.com/influxdata/influxdb/pull/6942): Fix panic: truncate the slice when merging the caches.
 - [#6708](https://github.com/influxdata/influxdb/issues/6708): Drop writes from before the retention policy time window.
 - [#6968](https://github.com/influxdata/influxdb/issues/6968): Always use the demo config when outputting a new config.
+- [#6986](https://github.com/influxdata/influxdb/pull/6986): update connection settings when changing hosts in cli.
 
 ## v0.13.0 [2016-05-12]
 
diff --git a/cmd/influx/cli/cli.go b/cmd/influx/cli/cli.go
index d4bf52bc0d2..409fb32998b 100644
--- a/cmd/influx/cli/cli.go
+++ b/cmd/influx/cli/cli.go
@@ -292,6 +292,13 @@ func (c *CommandLine) Connect(cmd string) error {
 		return fmt.Errorf("Failed to connect to %s\n", c.Client.Addr())
 	}
 	c.ServerVersion = v
+	// Update the command with the current connection information
+	if h, p, err := net.SplitHostPort(config.URL.Host); err == nil {
+		c.Host = h
+		if i, err := strconv.Atoi(p); err == nil {
+			c.Port = i
+		}
+	}
 
 	return nil
 }