diff --git a/changelog/CHANGELOG.tmpl b/changelog/CHANGELOG.tmpl
index 343cad6ba..8ce41a528 100644
--- a/changelog/CHANGELOG.tmpl
+++ b/changelog/CHANGELOG.tmpl
@@ -18,11 +18,11 @@ Details
 {{ range $par := .Paragraphs }}
    {{ wrap $par 80 3 }}
 {{ end -}}
-{{ range $id := .Issues }}
-   https://github.com/restic/restic/issues/{{ $id -}}
+{{ range $url := .IssueURLs }}
+   {{ $url -}}
 {{ end -}}
-{{ range $id := .PRs }}
-   https://github.com/restic/restic/pull/{{ $id -}}
+{{ range $url := .PRURLs }}
+   {{ $url -}}
 {{ end -}}
 {{ range $url := .OtherURLs }}
    {{ $url -}}
diff --git a/changelog/changelog-entry.tmpl b/changelog/TEMPLATE
similarity index 100%
rename from changelog/changelog-entry.tmpl
rename to changelog/TEMPLATE