diff --git a/UPGRADING.md b/UPGRADING.md
index da1c2f099..7a8421466 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -120,8 +120,10 @@ both stacks.
 ### Using the updated p2p library
 
 The P2P library was reimplemented in this release. The new implementation is
-enabled by default in this version of Tendermint. The legacy implementation is still
-included in this version of Tendermint and can be enabled in the configuration file.
+enabled by default in this version of Tendermint . The legacy implementation is still
+included in this version of Tendermint as a backstop to work around unforeseen
+production issues. The new and legacy version are interoperable. If necessary, 
+you can enable the legacy implementation in the server configuration file.
 
 To make use of the legacy P2P implemementation add the following line to your
 server's configuration file:
@@ -130,6 +132,9 @@ server's configuration file:
 use-legacy = true
 ```
 
+If you need to do this, please consider filing an issue in the Tendermint repository
+to let us know why. We plan to remove the legacy P2P code in the next (v0.36) release.
+
 #### New p2p queue types
 
 The new p2p implementation enables selection of the queue type to be used for