diff --git a/README.md b/README.md
index 120579a6..b915bab4 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ Ansible config and a bunch of Docker containers.
 * [Tautulli](http://tautulli.com/) - Monitor Your Plex Media Server
 * [Telegraf](https://github.com/influxdata/telegraf) - Metrics collection agent
 * [The Lounge](https://thelounge.chat) - Web based always-on IRC client
-* [TimeMachine](https://github.com/awlx/samba-timemachine) - Samba-based mac backup server (see [upgrade note](https://davidstephens.uk/ansible-nas/upgrading/))
+* [TimeMachine](https://github.com/awlx/samba-timemachine) - Samba-based mac backup server
 * [Traefik](https://traefik.io/) - Web proxy and SSL certificate manager
 * [Transmission](https://transmissionbt.com/) - BitTorrent client (with OpenVPN if you have a supported VPN provider)
 * [Wallabag](https://wallabag.org/) - Save and classify articles. Read them later.
diff --git a/docs/applications/timemachine.md b/docs/applications/timemachine.md
index 9e25a882..202e3ec9 100644
--- a/docs/applications/timemachine.md
+++ b/docs/applications/timemachine.md
@@ -26,4 +26,8 @@ The Samba server included in the Time Machine docker container logs to `STDOUT`
   <dd>The name of the share as it will appear in the Time Machine application. Default is 'Data'</dd>
   <dt><strong>timemachine_password</strong></dt>
   <dd>The password used to access the share.  Default is 'timemachine'</dd>
-<dl>
\ No newline at end of file
+<dl>
+
+## Upgrading from AFP to SMB-based Time Machine
+
+Older versions of Time Machine included in Ansible-NAS relied on AFP (netatalk) shares. Apple has deprecated Time Machine over AFP in favor of SMB (Samba), and current versions of Ansible-NAS use a Samba-based Time Machine share. If you are upgrading from an older version of Ansible-NAS with the AFP-based Time Machine, you will need to re-select your Time Machine back up disk by opening Time Machine Preferences and Selecting your backup disk via the "Select Disk..." option. Your Mac will find the old backups on the share and use them.
\ No newline at end of file
diff --git a/docs/upgrading.md b/docs/upgrading.md
index f7e1d52b..d769a826 100644
--- a/docs/upgrading.md
+++ b/docs/upgrading.md
@@ -1,5 +1,3 @@
 # Upgrading
 
-Pull the latest Ansible-NAS repo, merge any new config sections from `group_vars/all.yml.dist` into your `group_vars/all.yml`, then run the playbook.
-
-Older versions of Time Machine included in Ansible-NAS relied on AFP (netatalk) shares. Apple has deprecated Time Machine over AFP in favor of SMB (Samba), and current versions of Ansible-NAS use a Samba-based Time Machine share. If you are upgrading from an older version of Ansible-NAS with the AFP-based Time Machine, you will need to re-select your Time Machine back up disk by opening Time Machine Preferences and Selecting your backup disk via the "Select Disk..." option. Your Mac will find the old backups on the share and use them.
\ No newline at end of file
+Pull the latest Ansible-NAS repo, merge any new config sections from `group_vars/all.yml.dist` into your `group_vars/all.yml`, then run the playbook.
\ No newline at end of file