diff --git a/doc/release-notes.md b/doc/release-notes.md
index ad9e3bced..f3bc3e4ec 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,7 +1,16 @@
# Bitcoin ABC 0.23.6 Release Notes
Bitcoin ABC version 0.23.6 is now available from:
This release includes the following features and fixes:
+
+Wallet
+------
+
+- Backwards compatibility has been dropped for two `getaddressinfo` RPC
+ deprecations, as notified in the 0.22.10 release notes. The deprecated `label`
+ field has been removed as well as the deprecated `labels` behavior of
+ returning a JSON object containing `name` and `purpose` key-value pairs. Since
+ 0.22.4, the `labels` field returns a JSON array of label names.
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index b1919d329..928972868 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1,5029 +1,4999 @@
// Copyright (c) 2010 Satoshi Nakamoto
// Copyright (c) 2009-2019 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
#include // for GetConsensus.
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include