diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ce964a9ad..00af43558 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -25,7 +25,7 @@ Link issues and relevant forum posts here.
 - [ ] I have read the [Contribution Guidelines](https://github.com/restic/restic/blob/master/CONTRIBUTING.md#providing-patches)
 - [ ] I have added tests for all changes in this PR
 - [ ] I have added documentation for the changes (in the manual)
-- [ ] There's a new file in a subdir of `changelog/` (named after an unreleased version) that describe the changes for our users (template [here](https://github.com/restic/restic/blob/master/changelog/changelog-entry.tmpl))
+- [ ] There's a new file in `changelog/unreleased/` that describes the changes for our users (template [here](https://github.com/restic/restic/blob/master/changelog/changelog-entry.tmpl))
 - [ ] I have run `gofmt` on the code in all commits
 - [ ] All commit messages are formatted in the same style as [the other commits in the repo](https://github.com/restic/restic/blob/master/CONTRIBUTING.md#git-commits)
 - [ ] I'm done, this Pull Request is ready for review
diff --git a/changelog/0.8.4/issue-1652 b/changelog/unreleased/issue-1652
similarity index 100%
rename from changelog/0.8.4/issue-1652
rename to changelog/unreleased/issue-1652
diff --git a/changelog/0.8.4/pull-1647 b/changelog/unreleased/pull-1647
similarity index 100%
rename from changelog/0.8.4/pull-1647
rename to changelog/unreleased/pull-1647
diff --git a/changelog/0.8.4/pull-1648 b/changelog/unreleased/pull-1648
similarity index 100%
rename from changelog/0.8.4/pull-1648
rename to changelog/unreleased/pull-1648
diff --git a/changelog/0.8.4/pull-1649 b/changelog/unreleased/pull-1649
similarity index 100%
rename from changelog/0.8.4/pull-1649
rename to changelog/unreleased/pull-1649