diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d48abfba5..3d1dba084 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-16  Thomas Wolff  <towo@computer.org>
+
+	* fhandler_console.cc (get_win32_attr): Avoid inappropriate intensity
+	interchanging that used to render reverse output unreadable when
+	non-reversed text is bright.
+
 2004-12-15  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygwin.din: Add utmpx symbols.
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 242366fe5..418f986fc 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -938,11 +938,11 @@ fhandler_console::get_win32_attr ()
       win_fg = (win_bg & BACKGROUND_RED   ? FOREGROUND_RED   : 0) |
 	       (win_bg & BACKGROUND_GREEN ? FOREGROUND_GREEN : 0) |
 	       (win_bg & BACKGROUND_BLUE  ? FOREGROUND_BLUE  : 0) |
-	       (win_fg & FOREGROUND_INTENSITY);
+	       (win_bg & BACKGROUND_INTENSITY ? FOREGROUND_INTENSITY : 0);
       win_bg = (save_fg & FOREGROUND_RED   ? BACKGROUND_RED   : 0) |
 	       (save_fg & FOREGROUND_GREEN ? BACKGROUND_GREEN : 0) |
 	       (save_fg & FOREGROUND_BLUE  ? BACKGROUND_BLUE  : 0) |
-	       (win_bg & BACKGROUND_INTENSITY);
+	       (save_fg & FOREGROUND_INTENSITY ? BACKGROUND_INTENSITY : 0);
     }
   if (dev_state->underline)
     win_fg = dev_state->underline_color;