diff --git a/command/server.go b/command/server.go
index 2ba97a428d..8af0733510 100644
--- a/command/server.go
+++ b/command/server.go
@@ -440,7 +440,7 @@ func (c *ServerCommand) Run(args []string) int {
 	}()
 
 	infoKeys = append(infoKeys, "version")
-	info["version"] = version.GetVersion().String()
+	info["version"] = version.GetVersion().FullVersionNumber()
 
 	// Server configuration output
 	padding := 24
diff --git a/command/server/listener_atlas.go b/command/server/listener_atlas.go
index ee62be6966..f23502bd1d 100644
--- a/command/server/listener_atlas.go
+++ b/command/server/listener_atlas.go
@@ -29,7 +29,7 @@ func (s *SCADAListener) Addr() net.Addr {
 func atlasListenerFactory(config map[string]string, logger io.Writer) (net.Listener, map[string]string, ReloadFunc, error) {
 	scadaConfig := &scada.Config{
 		Service:      "vault",
-		Version:      version.GetVersion().Version,
+		Version:      version.GetVersion().VersionNumber(),
 		ResourceType: "vault-cluster",
 		Meta: map[string]string{
 			"node_id": config["node_id"],
diff --git a/command/version.go b/command/version.go
index d50a36d960..4c98b9a1bc 100644
--- a/command/version.go
+++ b/command/version.go
@@ -16,7 +16,7 @@ func (c *VersionCommand) Help() string {
 }
 
 func (c *VersionCommand) Run(_ []string) int {
-	c.Ui.Output(c.VersionInfo.String())
+	c.Ui.Output(c.VersionInfo.FullVersionNumber())
 	return 0
 }
 
diff --git a/http/sys_health.go b/http/sys_health.go
index 771c5d6b79..40797be129 100644
--- a/http/sys_health.go
+++ b/http/sys_health.go
@@ -140,7 +140,7 @@ func getSysHealth(core *vault.Core, r *http.Request) (int, *HealthResponse, erro
 		Sealed:        sealed,
 		Standby:       standby,
 		ServerTimeUTC: time.Now().UTC().Unix(),
-		Version:       version.GetVersion().String(),
+		Version:       version.GetVersion().VersionNumber(),
 		ClusterName:   clusterName,
 		ClusterID:     clusterID,
 	}
diff --git a/http/sys_seal.go b/http/sys_seal.go
index 9a005fbccc..642410a833 100644
--- a/http/sys_seal.go
+++ b/http/sys_seal.go
@@ -186,7 +186,7 @@ func handleSysSealStatusRaw(core *vault.Core, w http.ResponseWriter, r *http.Req
 		T:           sealConfig.SecretThreshold,
 		N:           sealConfig.SecretShares,
 		Progress:    core.SecretProgress(),
-		Version:     version.GetVersion().String(),
+		Version:     version.GetVersion().VersionNumber(),
 		ClusterName: clusterName,
 		ClusterID:   clusterID,
 	})
diff --git a/version/version.go b/version/version.go
index 6225d814f9..705039ffc6 100644
--- a/version/version.go
+++ b/version/version.go
@@ -38,12 +38,27 @@ func GetVersion() *VersionInfo {
 	}
 }
 
-func (c *VersionInfo) String() string {
+func (c *VersionInfo) VersionNumber() string {
+	if Version == "unknown" && VersionPrerelease == "unknown" {
+		return "(version unknown)"
+	}
+
+	version := fmt.Sprintf("%s", c.Version)
+
+	if c.VersionPrerelease != "" {
+		version = fmt.Sprintf("%s-%s", version, c.VersionPrerelease)
+	}
+
+	return version
+}
+
+func (c *VersionInfo) FullVersionNumber() string {
 	var versionString bytes.Buffer
 
 	if Version == "unknown" && VersionPrerelease == "unknown" {
-		fmt.Fprintf(&versionString, "Vault (version unknown)")
+		return "Vault (version unknown)"
 	}
+
 	fmt.Fprintf(&versionString, "Vault v%s", c.Version)
 	if c.VersionPrerelease != "" {
 		fmt.Fprintf(&versionString, "-%s", c.VersionPrerelease)
diff --git a/website/source/docs/http/sys-health.html.md b/website/source/docs/http/sys-health.html.md
index 5476325382..f1ce6b42fb 100644
--- a/website/source/docs/http/sys-health.html.md
+++ b/website/source/docs/http/sys-health.html.md
@@ -63,7 +63,7 @@ description: |-
 {
   "cluster_id": "c9abceea-4f46-4dab-a688-5ce55f89e228",
   "cluster_name": "vault-cluster-5515c810",
-  "version": "Vault v0.6.1-dev ('f76c926b0a36e55e71190eb3e2da312f29aca54e+CHANGES')",
+  "version": "0.6.1-dev"
   "server_time_utc": 1469555798,
   "standby": false,
   "sealed": false,
diff --git a/website/source/docs/http/sys-seal-status.html.md b/website/source/docs/http/sys-seal-status.html.md
index 03d1ce3d57..f6fdc4758e 100644
--- a/website/source/docs/http/sys-seal-status.html.md
+++ b/website/source/docs/http/sys-seal-status.html.md
@@ -32,11 +32,11 @@ description: |-
       "t": 3,
       "n": 5,
       "progress": 2,
-      "version": "Vault v0.6.1"
+      "version": "0.6.1-dev"
     }
     ```
     
-    Sample response when the unseal finishes.
+    Sample response when Vault is unsealed.
     
     ```javascript
     {
@@ -44,7 +44,7 @@ description: |-
       "t": 3,
       "n": 5,
       "progress": 0,
-      "version": "Vault v0.6.1",
+      "version": "0.6.1-dev",
       "cluster_name": "vault-cluster-d6ec3c7f",
       "cluster_id": "3e8b3fec-3749-e056-ba41-b62a63b997e8"
     }