diff --git a/phpBB/admin/index.php b/phpBB/admin/index.php
index 9a3f75276e..ad5d828394 100644
--- a/phpBB/admin/index.php
+++ b/phpBB/admin/index.php
@@ -455,7 +455,7 @@ elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
 					"FORUM_LOCATION" => $location,
 					"IP_ADDRESS" => $reg_ip, 
 
-					"U_WHOIS_IP" => "http://www.geektools.com/cgi-bin/proxy.cgi?query=$reg_ip&targetnic=auto", 
+					"U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$reg_ip", 
 					"U_USER_PROFILE" => append_sid("admin_users.$phpEx?mode=edit&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']),
 					"U_FORUM_LOCATION" => append_sid($location_url))
 				);
@@ -547,7 +547,7 @@ elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' )
 				"FORUM_LOCATION" => $location,
 				"IP_ADDRESS" => $guest_ip, 
 
-				"U_WHOIS_IP" => "http://www.geektools.com/cgi-bin/proxy.cgi?query=$guest_ip&targetnic=auto", 
+				"U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$guest_ip", 
 				"U_FORUM_LOCATION" => append_sid($location_url))
 			);
 		}
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 45df29ced8..59a2c68e50 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -66,6 +66,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed potential vulnerability in 2.0.5 login username entry - <b>throw away/eomer</b></li>
 <li>Fixed sql injection with reset date format field in profile - <b>tendor</b></li>
 <li>Fixed several vulnerabilities in modcp - <b>Robert Lavierck</b></li>
+<li>Changed whois lookup address within admin index</li>
 </ul>
 
 <a name="204"></a><h3 class="h3">1.ii. Changes since 2.0.4</h3>