diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 54fdb2ba14..238918895c 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1464,6 +1464,9 @@ function user_ipwhois($ip)
 
 	$ipwhois = '';
 
+	// Limit the query to all possible flags (whois.arin.net)
+	$ip = 'z ' . $ip;
+
 	if (($fsk = @fsockopen($whois_host, 43)))
 	{
 		// CRLF as per RFC3912