diff --git a/admin_manual/configuration_files/encryption_configuration.rst b/admin_manual/configuration_files/encryption_configuration.rst
index e74d4d4aa..227a09189 100644
--- a/admin_manual/configuration_files/encryption_configuration.rst
+++ b/admin_manual/configuration_files/encryption_configuration.rst
@@ -2,6 +2,9 @@
 Encryption Configuration
 ========================
 
+If you are upgrading from ownCloud 8.0, and have encryption enabled, please see 
+:ref:`upgrading` for the correct steps to upgrade your encryption. 
+
 In ownCloud 8.1 the server-side encryption has a number of changes and 
 improvements, including:
 
@@ -72,6 +75,8 @@ reversible**, and if you lose your encryption keys your files are not
 recoverable. Always have backups of your encryption keys stored in a safe 
 location, and consider enabling all recovery options.
 
+.. _enable_encryption:
+
 Enabling Encryption
 -------------------
 
@@ -211,6 +216,26 @@ Key then you can change a user's password in the ownCloud Users panel to match
 their back-end password, and then, of course, notify the user and give them 
 their new password.
 
+.. _upgrading:
+
+Upgrading From ownCloud 8.0
+---------------------------
+
+The encryption backend has changed in ownCloud 8.1, so you must take some 
+additional steps to migrate encryption correctly. If you do not follow these 
+steps you may not be able to access your files.
+
+After your upgrade is complete, follow the steps in :ref:`enable_encryption` to 
+enable the new encryption system. Then click the **Start Migration** button 
+on your Admin page to migrate your encryption keys, or use the ``occ`` command. 
+This example is for Debian/Ubuntu Linux::
+
+ $ sudo -u www-data php occ encryption:migrate-keys
+ 
+You must run ``occ`` as your HTTP user; see 
+:doc:`../configuration_server/occ_command`. 
+
+
 .. This section commented out because there is no windows support
 .. in oC8; un-comment this if windows support is restored
 .. "Missing requirements" Message on Windows Servers
diff --git a/admin_manual/release_notes.rst b/admin_manual/release_notes.rst
index b9f93fc12..094d194f3 100644
--- a/admin_manual/release_notes.rst
+++ b/admin_manual/release_notes.rst
@@ -26,8 +26,16 @@ Supported Platforms
   only), Linux (CentOS 6.5, 7, Ubuntu 12.04 LTS, 14.04 LTS, 14.10, Fedora 20, 
   21, openSUSE 12.3, 13)
 * Mobile apps: iOS 7+, Android 4+
-* Web browser: IE8+ (but not compatibility mode), Firefox 14+, Chrome 18+, Safari 5+
+* Web browser: IE8+ (but not compatibility mode), Firefox 14+, Chrome 18+, 
+  Safari 5+
 
+Special Migration Considerations for Encryption
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When you upgrade from ownCloud 8.0, with encryption enabled, to 8.1, you must 
+enable the new encryption backend and migrate your encryption keys. See 
+:doc:`configuration_files/encryption_configuration`
+  
 Older Desktop Clients Not Allowed to Connect and Sync
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^