diff --git a/CHANGELOG b/CHANGELOG
index 7f679f18ca..c888b9966b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,14 +13,12 @@ git-annex (8.20191107) UNRELEASED; urgency=medium
     Microbenchmarks show around 10-25% speedup of sqlite database operations.
   * Improved serialization of filenames and keys to the sqlite databases,
     avoiding encoding problems.
-  * annex.dotfiles configuration setting can be used to let dotfiles
-    be added to the annex the same as other files. When it's set,
-    annex.largefiles can be used to match whatever dotfiles should be added.
-  * add: Explicitly passing dotfiles no longer adds them to the annex,
-    unless you set annex.dotfiles=true.
   * add: When adding a whole directory, any dotfiles found in it will
     not be skipped, but will be added to git by default. This behavior
     can be configured with annex.dotfiles.
+  * add: Removed special case for explicitly passing dotfiles,
+    that no longer adds them to the annex, but to git. This behavior
+    can be configured with annex.dotfiles.
   * add: Removed the --include-dotfiles option.
 
  -- Joey Hess <id@joeyh.name>  Tue, 29 Oct 2019 15:13:03 -0400
diff --git a/doc/upgrades.mdwn b/doc/upgrades.mdwn
index 77c3244f25..2660c4be7f 100644
--- a/doc/upgrades.mdwn
+++ b/doc/upgrades.mdwn
@@ -54,19 +54,19 @@ The upgrade events, so far:
 v7 repositories are automatically upgraded to v8.
 
 Some sqlite databases that git-annex uses were changed in v8 and have to be
-re-populated.
+re-populated. As a consequence:
 
-Any incremental fscks that were started in v7 won't resume where they left
-off in v8, but will instead begin again from the first file.
+* Any incremental fscks that were started in v7 won't resume where they left
+  off in v8, but will instead begin again from the first file.
 
-An interrupted export that was started in v7 won't resume where it left off
-after upgrade to v8; files will be re-uploaded to the export remote.
+* An interrupted export that was started in v7 won't resume where it left off
+  after upgrade to v8; files will be re-uploaded to the export remote.
+
+* After the upgrade, git-annex will in some situations have to do extra
+  work while it finishes populating the new databases. After this one-time
+  speed cost, git-annex's speed will improve when using the new and improved
+  databases.
 
-After the upgrade, git-annex will in some situations have to do extra
-work while it finishes populating the new databases. After this one-time
-speed cost, git-annex's speed will improve when using the new and improved
-databases.
-  
 Also, there are some behavior changes around adding dotfiles. While before
 git-annex add skipped adding dotfiles when operating on whole directories,
 and added dotfiles that were explicitly listed to the annex, it now adds