diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7b9c59df857..ffb1a6bc280 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep 20 12:14:45 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* fold-const.c (fold): Fix another type in COND_EXPR handling code.
+
 1998-09-20  Michael Hayes  <m.hayes@elec.canterbury.ac.nz>
 
 	* configure.in: Add support for c4x targets.
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 5eab6562282..b7037deeea7 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -6014,7 +6014,8 @@ fold (expr)
 	      t = build (code, type, tem,
 			 TREE_OPERAND (t, 2), TREE_OPERAND (t, 1));
 	      arg0 = tem;
-	      arg1 = TREE_OPERAND (t, 2);
+	      /* arg1 should be the first argument of the new T.  */
+	      arg1 = TREE_OPERAND (t, 1);
 	      STRIP_NOPS (arg1);
 	    }
 	}