diff --git a/doc/release-notes.md b/doc/release-notes.md
index 68d63ce7d..5b0bf0a0a 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,9 +1,18 @@
Bitcoin ABC version 0.20.11 is now available from:
This release includes the following features and fixes:
- The `prioritisetransaction` RPC no longer takes a `priority_delta` argument,
which is replaced by a `dummy` argument for backwards compatibility with
clients using positional arguments. The RPC is still used to change the
apparent fee-rate of the transaction by using the `fee_delta` argument.
+ - Bare multisig outputs to our keys are no longer automatically treated as
+ incoming payments. As this feature was only available for multisig outputs for
+ which you had all private keys in your wallet, there was generally no use for
+ them compared to single-key schemes. Furthermore, no address format for such
+ outputs is defined, and wallet software can't easily send to it. These outputs
+ will no longer show up in `listtransactions`, `listunspent`, or contribute to
+ your balance, unless they are explicitly watched (using `importaddress` or
+ `importmulti` with hex script argument). `signrawtransaction*` also still
+ works for them.
diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp
index 53715c03b..611e1dad5 100644
--- a/src/script/ismine.cpp
+++ b/src/script/ismine.cpp
@@ -1,105 +1,126 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2016 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include