diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 24e57a72903..96d20317b68 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -40,6 +40,7 @@ https://github.com/elastic/apm-server/compare/71df0d96445df35afe27f38bcf734a0828
 - Add Kibana sourcefilter for `sourcemap.sourcemap` {pull}454[454]
 - Increase default 'ConcurrentRequests' from 20 to 40{pull}492[492]
 - Add Config option for excluding stack trace frames from `grouping_key` calculation {pull}482[482]
+- Expose expvar {pull}509[509]
 
 ==== Deprecated
 
diff --git a/_meta/beat.reference.yml b/_meta/beat.reference.yml
index 6738b89e3e4..7ff404bb4e7 100644
--- a/_meta/beat.reference.yml
+++ b/_meta/beat.reference.yml
@@ -69,3 +69,11 @@ apm-server:
       # If the default index pattern at 'outputs.elasticsearch.index' is changed,
       # a matching index pattern needs to be specified here.
       #index_pattern: "apm*"
+
+  # golang expvar support - https://golang.org/pkg/expvar/
+  #expvar:
+  # Set to true to Expose expvar
+  #enabled: false
+
+  # Url to expose expvar
+  #url: "/debug/vars"
diff --git a/apm-server.reference.yml b/apm-server.reference.yml
index 5ced9302add..d0b51c82921 100644
--- a/apm-server.reference.yml
+++ b/apm-server.reference.yml
@@ -70,6 +70,14 @@ apm-server:
       # a matching index pattern needs to be specified here.
       #index_pattern: "apm*"
 
+  # golang expvar support - https://golang.org/pkg/expvar/
+  #expvar:
+  # Set to true to Expose expvar
+  #enabled: false
+
+  # Url to expose expvar
+  #url: "/debug/vars"
+
 #================================ General ======================================
 
 # The name of the shipper that publishes the network data. It can be used to group