diff --git a/CHANGELOG.md b/CHANGELOG.md
index e22ca61d..6afd1c1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,14 +16,17 @@ efficiency, reliability and portability.
   block download.
 - The `addrindex` has been sorted to support querying for large sets
   of results, and will no longer cause CPU and memory exhaustion issues.
+- The `addrindex` will correctly distinguish between `p2pkh` and
+  `p2wpkh` addresses.
 
 To upgrade to the new disk layout it's necessary to move block data
 from LevelDB (e.g. `~/.bcoin/chain`) to a new file based block
-storage (e.g. `~./.bcoin/blocks`).
+storage (e.g. `~./.bcoin/blocks`), and remove `txindex` and `addrindex`
+data from the chain database, for those that have that feature enabled.
 
 To do this you can run:
 ```
-node ./migrate/chaindb4to5.js /path/to/bcoin/chain
+node ./migrate/chaindb4to6.js /path/to/bcoin/chain
 ```
 
 The migration will take 1-3 hours, depending on hardware. The block data
@@ -34,16 +37,10 @@ Alternatively, you can also sync the chain again, however the above
 migration will be faster as additional network bandwidth won't be used
 for downloading the blocks again.
 
-For those with `txindex` and `addrindex` enabled there is an additional
-step to cleanup and regenerate the indexes.
-
-``` bash
-$ ./migrate/chaindb5to6.js /path/to/bcoin/chain
-```
-
-The indexes will be regenerated by rescanning the chain on next startup,
-this process might take a while. Please take the potential downtime in
-re-indexing into account before upgrading.
+For those with `txindex` and `addrindex` enabled, the indexes will be
+regenerated by rescanning the chain on next startup, this process might
+take a while. Please take the potential downtime in re-indexing into
+account before upgrading.
 
 ### Wallet API changes