diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e1560254..5024e6eed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -185,7 +185,7 @@ BUG FIXES:
  * client: Fix lock contention that could cause a node to miss a heartbeat and
    be marked as down [[GH-3195](https://github.com/hashicorp/nomad/issues/3195)]
  * client: Fix data race that could lead to concurrent map read/writes during
-   hearbeating and fingerprinting [[GH-3461](https://github.com/hashicorp/nomad/issues/3461)]
+   heartbeating and fingerprinting [[GH-3461](https://github.com/hashicorp/nomad/issues/3461)]
  * driver/docker: Fix docker user specified syslogging [[GH-3184](https://github.com/hashicorp/nomad/issues/3184)]
  * driver/docker: Fix issue where CPU usage statistics were artificially high
    [[GH-3229](https://github.com/hashicorp/nomad/issues/3229)]
diff --git a/client/client.go b/client/client.go
index 8f0c5ae9b..fe930220f 100644
--- a/client/client.go
+++ b/client/client.go
@@ -1044,7 +1044,7 @@ func (c *Client) retryIntv(base time.Duration) time.Duration {
 }
 
 // registerAndHeartbeat is a long lived goroutine used to register the client
-// and then start heartbeatng to the server.
+// and then start heartbeating to the server.
 func (c *Client) registerAndHeartbeat() {
 	// Register the node
 	c.retryRegisterNode()