diff --git a/CHANGES b/CHANGES
index 54665e5092..4da4fd9b13 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,9 @@
 
 AMI (Asterisk Manager Interface)
 ------------------
+ * The SIPshowpeer action will now include a 'SubscribeContext' field for a peer
+   in its response if the peer has a subscribe context set.
+
  * The SIPqualifypeer action now acknowledges the request once it has established
    that the request is against a known peer. It also issues a new event,
    'SIPqualifypeerdone', once the qualify action has been completed.
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c939df955b..a0b1c2ff0e 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19876,6 +19876,9 @@ static char *_sip_show_peer(int type, int fd, struct mansession *s, const struct
 		astman_append(s, "RemoteSecretExist: %s\r\n", ast_strlen_zero(peer->remotesecret)?"N":"Y");
 		astman_append(s, "MD5SecretExist: %s\r\n", ast_strlen_zero(peer->md5secret)?"N":"Y");
 		astman_append(s, "Context: %s\r\n", peer->context);
+		if (!ast_strlen_zero(peer->subscribecontext)) {
+			astman_append(s, "SubscribeContext: %s\r\n", peer->subscribecontext);
+		}
 		astman_append(s, "Language: %s\r\n", peer->language);
 		astman_append(s, "ToneZone: %s\r\n", peer->zone[0] != '\0' ? peer->zone : "<Not set>");
 		if (!ast_strlen_zero(peer->accountcode))