diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 76092417aa..cbee06217b 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-02  James E Wilson  <wilson@specifix.com>
+
+	* gprof.c (main): When setting default output_style, add separate
+	checks for INPUT_HISTOGRAM and INPUT_CALL_GRAPH.
+
 2006-04-25  Masaki Muranaka  <monaka@monami-software.com>
 
 	PR 2587
diff --git a/gprof/gprof.c b/gprof/gprof.c
index dc6b618fdf..b2d6bafdef 100644
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -545,7 +545,12 @@ This program is free software.  This program has absolutely no warranty.\n"));
   if (output_style == 0)
     {
       if (gmon_input & (INPUT_HISTOGRAM | INPUT_CALL_GRAPH))
-	output_style = STYLE_FLAT_PROFILE | STYLE_CALL_GRAPH;
+	{
+	  if (gmon_input & INPUT_HISTOGRAM)
+	    output_style |= STYLE_FLAT_PROFILE;
+	  if (gmon_input & INPUT_CALL_GRAPH)
+	    output_style |= STYLE_CALL_GRAPH;
+	}
       else
 	output_style = STYLE_EXEC_COUNTS;