diff --git a/CHANGES b/CHANGES
index 1496f6ca7fc0d8cf1c2a39eec0e4de6cc8acf8e1..d14ba07db1fd97876e88c928f26ce3e28fdc5758 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,7 +12,9 @@
 --- Functionality changes from Asterisk 1.8 to Asterisk 1.10 -----------------
 ------------------------------------------------------------------------------
 
-
+Asterisk Manager Interface
+--------------------------
+ * PeerStatus now includes Address and Port.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 5bb6b2c5938573ef3871691d6fd19c6fce69e71e..af4cb72e3072d4befc869bd9d180abacdc58ca0e 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -8585,7 +8585,7 @@ static int update_registry(struct sockaddr_in *sin, int callno, char *devtype, i
 			ast_db_put("IAX/Registry", p->name, data);
 			ast_verb(3, "Registered IAX2 '%s' (%s) at %s:%d\n", p->name,
 					    ast_test_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED) ? "AUTHENTICATED" : "UNAUTHENTICATED", ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port));
-			manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Registered\r\n", p->name);
+			manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Registered\r\nAddress: %s\r\nPost: %d\r\n", p->name, ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port));
 			register_peer_exten(p, 1);
 			ast_devstate_changed(AST_DEVICE_UNKNOWN, "IAX2/%s", p->name); /* Activate notification */
 		} else if (!ast_test_flag64(p, IAX_TEMPONLY)) {