diff --git a/changelog/10077.txt b/changelog/10077.txt
new file mode 100644
index 000000000000..09b6cd54cf6a
--- /dev/null
+++ b/changelog/10077.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+core: Fix client.Clone() to include the address
+```
diff --git a/changelog/changelog.tmpl b/changelog/changelog.tmpl
new file mode 100644
index 000000000000..6f5183e85bb4
--- /dev/null
+++ b/changelog/changelog.tmpl
@@ -0,0 +1,48 @@
+{{- if index .NotesByType "breaking-change" -}}
+BREAKING CHANGES:
+
+{{range index .NotesByType "breaking-change" -}}
+* {{ template "note" .}}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.security }}
+SECURITY:
+
+{{range .NotesByType.security -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.feature -}}
+FEATURES:
+
+{{range .NotesByType.feature -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.improvement }}
+IMPROVEMENTS:
+
+{{range .NotesByType.improvement -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.deprecation }}
+DEPRECATIONS:
+
+{{range .NotesByType.deprecation -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
+{{- if .NotesByType.bug }}
+BUG FIXES:
+
+{{range .NotesByType.bug -}}
+* {{ template "note" . }}
+{{ end -}}
+{{- end -}}
+
diff --git a/changelog/note.tmpl b/changelog/note.tmpl
new file mode 100644
index 000000000000..022546f2753e
--- /dev/null
+++ b/changelog/note.tmpl
@@ -0,0 +1,3 @@
+{{- define "note" -}}
+{{.Body}}{{if not (stringHasPrefix .Issue "_")}} [[GH-{{- .Issue -}}](https://github.com/hashicorp/vault/pull/{{- .Issue -}})]{{end}}
+{{- end -}}