diff --git a/agent/agent_endpoint.go b/agent/agent_endpoint.go
index 39b38294d..c99e3ef14 100644
--- a/agent/agent_endpoint.go
+++ b/agent/agent_endpoint.go
@@ -57,12 +57,14 @@ func (s *HTTPServer) AgentSelf(resp http.ResponseWriter, req *http.Request) (int
 	config := struct {
 		Datacenter string
 		NodeName   string
+		NodeID     string
 		Revision   string
 		Server     bool
 		Version    string
 	}{
 		Datacenter: s.agent.config.Datacenter,
 		NodeName:   s.agent.config.NodeName,
+		NodeID:     string(s.agent.config.NodeID),
 		Revision:   s.agent.config.Revision,
 		Server:     s.agent.config.ServerMode,
 		Version:    s.agent.config.Version,
diff --git a/website/source/api/agent.html.md b/website/source/api/agent.html.md
index 4e46f854d..0ea8af64e 100644
--- a/website/source/api/agent.html.md
+++ b/website/source/api/agent.html.md
@@ -117,6 +117,7 @@ $ curl \
   "Config": {
     "Datacenter": "dc1",
     "NodeName": "foobar",
+    "NodeID": "9d754d17-d864-b1d3-e758-f3fe25a9874f",
     "Server": true,
     "Revision": "deadbeef",
     "Version": "1.0.0"