diff --git a/src/s_conf.c b/src/s_conf.c
index 8b963e13..6f4e3136 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -863,6 +863,14 @@ validate_conf(void)
 				
 	}
 
+	/* RFC 1459 says 1 message per 2 seconds on average is acceptable,
+	 * so allow at least that.
+	 */
+	if(ConfigFileEntry.client_flood_message_time >
+			ConfigFileEntry.client_flood_message_num * 2)
+		ConfigFileEntry.client_flood_message_time =
+			ConfigFileEntry.client_flood_message_num * 2;
+
 	if((ConfigFileEntry.client_flood_max_lines < CLIENT_FLOOD_MIN) ||
 	   (ConfigFileEntry.client_flood_max_lines > CLIENT_FLOOD_MAX))
 		ConfigFileEntry.client_flood_max_lines = CLIENT_FLOOD_MAX;