diff --git a/ChangeLog b/ChangeLog
index f5a1369a1e..535110285e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-21  Russell Bryant  <russell@digium.com>
+
+	* channels/chan_iax2.c (iax2_getpeername): Return non-zero to indicate that a peer was found when using realtime (issue #5815)
+
 2005-11-20  Russell Bryant  <russell@digium.com>
 
 	* Makefile apps/Makefile: Fix 'make install' for Solaris. (issue #5775)
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index c051330a6f..0c4a8b9584 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -859,10 +859,11 @@ static int iax2_getpeername(struct sockaddr_in sin, char *host, int len, int loc
 {
 	struct iax2_peer *peer;
 	int res = 0;
+
 	if (lockpeer)
 		ast_mutex_lock(&peerl.lock);
 	peer = peerl.peers;
-	while(peer) {
+	while (peer) {
 		if ((peer->addr.sin_addr.s_addr == sin.sin_addr.s_addr) &&
 				(peer->addr.sin_port == sin.sin_port)) {
 					ast_copy_string(host, peer->name, len);
@@ -879,8 +880,10 @@ static int iax2_getpeername(struct sockaddr_in sin, char *host, int len, int loc
 			ast_copy_string(host, peer->name, len);
 			if (ast_test_flag(peer, IAX_TEMPONLY))
 				destroy_peer(peer);
+			res = 1;
 		}
 	}
+
 	return res;
 }