diff --git a/configure b/configure
index ebab2289bac..24c0ef9532c 100755
--- a/configure
+++ b/configure
@@ -2715,7 +2715,8 @@ fi
 
 # The Intel compiler on Linux supports most gcc options, but not
 # all of them, so only add these options if we are really using
-# gcc
+# gcc.  Intel compiler has a bug in checking for division by NAN
+# (NaN == 0), -mp1 fixes it, so someday we might way to add it.
 
 if test "$GCC" = yes; then
 
diff --git a/configure.in b/configure.in
index 982e2081ce2..ecf26f30fd0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.458 2006/04/21 23:11:58 momjian Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.459 2006/04/22 00:27:30 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -250,7 +250,8 @@ fi
 
 # The Intel compiler on Linux supports most gcc options, but not
 # all of them, so only add these options if we are really using
-# gcc
+# gcc.  Intel compiler has a bug in checking for division by NAN
+# (NaN == 0), -mp1 fixes it, so someday we might way to add it.
 
 if test "$GCC" = yes; then
 AC_TRY_COMPILE([], [@%:@ifndef __INTEL_COMPILER