diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a16684a831..4f00acf4f9 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16095,6 +16095,7 @@ static void receive_message(struct sip_pvt *p, struct sip_request *req, struct a
 			if (!ast_strlen_zero(peer->messagecontext)) {
 				ast_string_field_set(p, messagecontext, peer->messagecontext);
 			}
+			ast_string_field_set(p, peername, peer->name);
 			peer = unref_peer(peer, "from find_peer() in receive_message");
 		}
 	}
@@ -16124,6 +16125,10 @@ static void receive_message(struct sip_pvt *p, struct sip_request *req, struct a
 		res |= ast_msg_set_context(msg, "%s", p->context);
 	}
 
+	if (!ast_strlen_zero(p->peername)) {
+		res |= ast_msg_set_var(msg, "SIP_PEERNAME", p->peername);
+	}
+
 	res |= ast_msg_set_exten(msg, "%s", p->exten);
 
 	if (res) {