diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c823362ca72..4be01e77585 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-15  Jakub Jelinek  <jakub@redhat.com>
 
+	* config/alpha/alpha.c (override_options): ev6 cache latencies
+	from Richard Henderson.  Don't allow -mmemory-latency=L0.
+
 	* config/alpha/alpha.h (TARGET_CPU_EV5, TARGET_CPU_EV6): Define.
 	(TARGET_OPTIONS): Add tune=.
 	(alpha_tune_string): Declare.
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 04d8cc99c44..382f9358204 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -309,11 +309,11 @@ override_options ()
 	{
 	  { 3, 30, -1 },	/* ev4 -- Bcache is a guess */
 	  { 2, 12, 38 },	/* ev5 -- Bcache from PC164 LMbench numbers */
-	  { 3, 13, -1 },	/* ev6 -- Ho hum, doesn't exist yet */
+	  { 3, 12, 30 },	/* ev6 -- Bcache from DS20 LMbench. */
 	};
 
 	lat = alpha_mlat_string[1] - '0';
-	if (lat < 0 || lat > 3 || cache_latency[alpha_cpu][lat-1] == -1)
+	if (lat <= 0 || lat > 3 || cache_latency[alpha_cpu][lat-1] == -1)
 	  {
 	    warning ("L%d cache latency unknown for %s",
 		     lat, alpha_cpu_name[alpha_cpu]);