diff --git a/CHANGELOG b/CHANGELOG
index a5fb402bf..548dd1289 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+2.3.1
+* hotfix for crash when upgrading from old versions
+
 2.3
 * remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)
 * fix setting expiry dates on keys (thanks to Ash Hughes)
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index 212f77cd4..5f18ed6f9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -110,7 +110,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         Log.w(Constants.TAG, "Upgrading database from version " + oldVersion + " to " + newVersion);
 
-        // Upgrade from oldVersion through all methods to newest one
+        // Upgrade from oldVersion through all cases to newest one
         for (int version = oldVersion; version < newVersion; ++version) {
             Log.w(Constants.TAG, "Upgrading database to version " + version);