diff --git a/editions/tw5.com/tiddlers/Upgrading.tid b/editions/tw5.com/tiddlers/Upgrading.tid
index 0f7d95a1e..dc3d85f77 100644
--- a/editions/tw5.com/tiddlers/Upgrading.tid
+++ b/editions/tw5.com/tiddlers/Upgrading.tid
@@ -27,30 +27,19 @@ Remember that TiddlyWiki version 5 is not fully backwards compatible with the ol
 This process will work on most desktop browsers. Note that none of your personal data leaves your browser with this process.
 
 # Locate your TiddlyWiki file in the file system (ie using Windows Explorer, the Finder on Mac OS X, or your file manager on Linux)
-# Visit http://tiddlywiki.com/empty.html in your browser
+# Visit http://tiddlywiki.com/upgrade.html in your browser
 # Drag your old TiddlyWiki HTML file into the browser window
 #* If the file is encrypted you will be prompted for the password
-#* Your tiddlers should be imported
-# Set a password if you want to use encryption
+# Review the list of tiddlers that will be upgraded
+# Click ''Import''
+# Set your password again if you want to use encryption
 # Save changes to save the new version
 
-This will download a file called ''empty.html'' to your computer. This file is the upgrade of your old file. You may need to open the location where ''empty.html'' was downloaded, rename ''empty.html'' with the name of the old file you are upgrading, and replace the old file by moving the new file in its place.
-
-//For the moment you'll also need to manually update any plugins that are not included in empty.html://
-
-># Open the control panel to the ''Plugins'' tab in your upgraded wiki
-># Check the version numbers of the plugins you are using; any plugins with an older version than the version of [[$:/core]] will probably need updating
-># Locate a wiki with the plugins you need to update and open the control panel ''Plugins'' tab
->#* http://tiddlywiki.com/d3demo.html for the D3 plugin
->#* http://tiddlywiki.com/codemirrordemo.html for the CodeMirror plugin
->#* http://tiddlywiki.com/markdowndemo.html for the MarkDown plugin
->#* http://tiddlywiki.com/ for most of the others
-># Drag the plugin links one by one back to your own wiki. You should see the version numbers update in the control panel
-># Save your wiki
+This will download a file called ''upgrade.html'' to your computer. This file is the upgrade of your old file. You may need to open the location where ''upgrade.html'' was downloaded, rename ''upgrade.html'' with the name of the old file you are upgrading, and replace the old file by moving the new file in its place.
 
 ! Offline upgrading
 
-You can also download http://tiddlywiki.com/empty.html locally and perform the same drag-and-drop procedure to upgrade your files.
+You can also download http://tiddlywiki.com/upgrade.html locally and perform the same drag-and-drop procedure to upgrade your files.
 
 ! Problems with Upgrades
 
diff --git a/editions/tw5.com/tiddlers/mechanisms/UpgradeMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/UpgradeMechanism.tid
index 250bbe2c8..b5c0b97e1 100644
--- a/editions/tw5.com/tiddlers/mechanisms/UpgradeMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/UpgradeMechanism.tid
@@ -18,20 +18,18 @@ tags: mechanism
 ## Displays the payload tiddlers as a list of titles and checkboxes, with a dropdown showing the full details of the tiddler
 ## Perhaps we also suppress the usual JSON display for data tiddlers behind a reveal widget
 # The user can adjust the selection checkboxes
-# Clicking "done" performs the following actions:
-## Unpack the selected tiddlers from the pending import tiddler
-## Delete the pending import tiddler
-## Delete the upgrade library tiddler
-##> Or we could just exclude those tiddlers from the subsequent save operation
+# Clicking "done" unpacks the selected tiddlers from the pending import tiddler
+# The pending import tiddler and the upgrade library tiddler are excluded from the subsequent save operation
 
 ! ToDo
 
-* ~~Add upgrade plugin containing instructions and one-shot UI~~
 * Grouping plugins
 * Incoming tiddler preview
 * Better display text for plugins
+* Better handling of encrypted upgrades
+* Docs
+* ~~Add upgrade plugin containing instructions and one-shot UI~~
 * ~~Suppressing $:/UpgradeLibrary and upgrade plugin from save~~
-* Finish UpgradeMechanism docs
 * ~~Checkboxes~~
 * ~~Visual difference for suppressed tiddlers~~
 * ~~Translation~~