diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 250c53bad..bb81594a4 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,5 @@
 <!-- check if this problem is already solved! github.com/issues?q=is:issue+user:fish-shell -->
-- [ ] Have you checked if problem occurs with [fish 2.4.0](/fish-shell/fish-shell/releases/tag/2.4.0)?
+- [ ] Have you checked if problem occurs with [fish 2.5.0](/fish-shell/fish-shell/releases/tag/2.5.0)?
 - [ ] Tried fish without third-party customizations *(check `sh -c 'env HOME=$(mktemp -d) fish'`)*?
 
 **fish version installed** *(`fish --version`)*:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0b629c3c..986cffa19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# fish 2.?.? (released ???)
+
+---
+
 # fish 2.5.0 (released February 3, 2017)
 
 There are no major changes between 2.5b1 and 2.5.0. If you are upgrading from version 2.4.0 or before, please also review the release notes for 2.5b1 (included below).
@@ -6,6 +10,8 @@ There are no major changes between 2.5b1 and 2.5.0. If you are upgrading from ve
 
 - The Home, End, Insert, Delete, Page Up and Page Down keys work in Vi-style key bindings (#3731).
 
+---
+
 # fish 2.5b1 (released January 14, 2017)
 
 ## Platform Changes