diff --git a/channels/h323/ChangeLog b/channels/h323/ChangeLog
index 83bdff31e7..2c3b8b5c58 100755
--- a/channels/h323/ChangeLog
+++ b/channels/h323/ChangeLog
@@ -1,4 +1,6 @@
 Build
+	
+	-- Add IP based authentication using 'host'in type=user's
 0.1.0
 	-- Intergration into the mainline Asterisk codebase
 	-- Remove reduandant debug info
diff --git a/channels/h323/chan_h323.c b/channels/h323/chan_h323.c
index 0d6fbe48b4..7ba3515021 100755
--- a/channels/h323/chan_h323.c
+++ b/channels/h323/chan_h323.c
@@ -957,6 +957,10 @@ int setup_incoming_call(call_details_t cd)
 			strncpy(p->context, default_context, sizeof(p->context)-1);
 			ast_log(LOG_DEBUG, "Sending %s to context [%s]\n", cd.call_source_aliases, p->context);
 		} else {
+			if (strcasecmp(cd.sourceIp, inet_ntoa(user->addr.sin_addr))){
+				ast_log(LOG_ERROR, "Call from user '%s' rejected due to non-matching IP address: '%s'\n", user->name, cd.sourceIp);
+                                return 0;
+			}
 			if (user->incominglimit > 0) {
 				if (user->inUse >= user->incominglimit) {
 					ast_log(LOG_ERROR, "Call from user '%s' rejected due to usage limit of %d\n", user->name, user->incominglimit);