diff --git a/ChangeLog b/ChangeLog
index 4e4c6b05..2968fe16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Anything we add/remove/fix/change is in here (even our rants)
 Fish (F), Mark (M), DeadNotBuried (D)
 ===============================================================================
 * NeoStats * Version 3.0.a3-dev
+ - allow SERVICEROOT to check against IP Address as well as Host (D)
  - check if exclusions are already included in list before adding (D)
  - attempt to find bot unused nickname when both nick and altnick in use (D)
  - QuoteServ: add option to use global excludes (D)
diff --git a/src/auth.c b/src/auth.c
index 1e106619..74310523 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -65,7 +65,8 @@ static int IsServiceRoot( Client *u )
 	/* Test client nick!user@host against the configured service root */
 	if( ( match( nsconfig.rootuser.nick, u->name ) ) &&
 		( match( nsconfig.rootuser.user, u->user->username ) ) &&
-		( match( nsconfig.rootuser.host, u->user->hostname ) ) ) {
+		( match( nsconfig.rootuser.host, u->user->hostname ) ||
+		  match( nsconfig.rootuser.host, u->hostip ) ) ) {
 		return NS_TRUE;
 	}
 	return NS_FALSE;