diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77c1c0cb..01e4e7b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The data API and cluster-management API remain unchanged however, so client code
 ### New features
 - [PR #796](https://github.com/rqlite/rqlite/pull/796): `nodes/` API reports real-time status of other nodes in cluster. Fixes [issue #768](https://github.com/rqlite/rqlite/issues/768).
 - [PR #802](https://github.com/rqlite/rqlite/pull/802): Add `.sysdump` command to rqlite CLI.
+- [PR #807](https://github.com/rqlite/rqlite/pull/807): rqlite CLI displays build information. Fixes [issue #768](https://github.com/rqlite/rqlite/issues/806).
 
 ### Implementation changes and bug fixes
  - [PR #792](https://github.com/rqlite/rqlite/pull/792): Fetch leader HTTP API addresses on demand.
diff --git a/cmd/version.go b/cmd/version.go
index 18c6850d..7bcbc392 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -2,9 +2,15 @@ package cmd
 
 // These variables are populated via the Go linker.
 var (
-	Version   = "6"
-	Commit    = "unknown"
-	Branch    = "unknown"
+	// rqlite version
+	Version = "6"
+
+	// Commit this code was built at.
+	Commit = "unknown"
+
+	// Branch the code was built from.
+	Branch = "unknown"
+
+	// Timestamp of build.
 	Buildtime = "unknown"
-	Features  = []string{}
 )