diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index f94aa6ff08b..1838e2d56d7 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun 28 10:43:11 1999  Craig Burley  <craig@jcb-sc.com>
+
+	* com.c (ffecom_prepare_expr_): A COMPLEX intrinsic needs
+	a temp even if -fno-f2c.
+
+	* version.c: Bump version.
+
 Mon Jun 28 21:31:35 1999  Craig Burley  <craig@jcb-sc.com>
 
 	* bugs.texi, news.texi: Doc upgrade to netlib libf2c as of today.
diff --git a/gcc/f/com.c b/gcc/f/com.c
index 9500956cc22..c326fedaae7 100644
--- a/gcc/f/com.c
+++ b/gcc/f/com.c
@@ -13068,7 +13068,10 @@ ffecom_prepare_expr_ (ffebld expr, ffebld dest UNUSED)
 
 	      s = ffebld_symter (ffebld_left (expr));
 	      if (ffesymbol_where (s) == FFEINFO_whereCONSTANT
-		  || ! ffesymbol_is_f2c (s))
+		  || (ffesymbol_where (s) != FFEINFO_whereINTRINSIC
+		      && ! ffesymbol_is_f2c (s))
+		  || (ffesymbol_where (s) == FFEINFO_whereINTRINSIC
+		      && ! ffe_is_f2c_library ()))
 		break;
 	    }
 	  else if (ffebld_op (expr) == FFEBLD_opPOWER)
diff --git a/gcc/f/version.c b/gcc/f/version.c
index 9b211b1074b..cba4229e05d 100644
--- a/gcc/f/version.c
+++ b/gcc/f/version.c
@@ -1 +1 @@
-const char *ffe_version_string = "0.5.25 19990526 (prerelease)";
+const char *ffe_version_string = "0.5.25 19990628 (prerelease)";