diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6032fc20..4d4d7878 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## v0.25.1
+
+*October 17, 2018*
+
+BUG FIXES:
+
+- [state] [\#2616](https://github.com/tendermint/tendermint/issues/2616) Fix panic when genesis file's `validators` field is nil
+- [consensus] [\#2634](https://github.com/tendermint/tendermint/issues/2634) Set `NextValidators` during replay
+
 ## v0.25.0
 
 *September 22, 2018*
@@ -164,8 +173,8 @@ BUG FIXES:
 *August 22nd, 2018*
 
 BUG FIXES:
-- [libs/autofile] \#2261 Fix log rotation so it actually happens.
-    - Fixes issues with consensus WAL growing unbounded ala \#2259
+- [libs/autofile] [\#2261](https://github.com/tendermint/tendermint/issues/2261) Fix log rotation so it actually happens.
+    - Fixes issues with consensus WAL growing unbounded ala [\#2259](https://github.com/tendermint/tendermint/issues/2259)
 
 ## 0.23.0
 
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 1453630f..81c7a3a2 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -15,5 +15,3 @@ FEATURES:
 IMPROVEMENTS:
 
 BUG FIXES:
-- \#2616 Pass nil to NewValidatorSet() when genesis file's Validators field is nil
-- \#2634 Set next validators along with validators while replay
diff --git a/version/version.go b/version/version.go
index d8bab577..5c09ce36 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,13 +4,13 @@ package version
 const (
 	Maj = "0"
 	Min = "25"
-	Fix = "0"
+	Fix = "1"
 )
 
 var (
 	// Version is the current version of Tendermint
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.25.0"
+	Version = "0.25.1"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string