diff --git a/ChangeLog b/ChangeLog
index 7f2f94a..e649dd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3679,3 +3679,10 @@ Mon Jun 12 13:33:39 PDT 2000	Michael Jennings <mej@eterm.org>
 	Fixes from Willem Monsuwe <willem@stack.nl> to his MMX routines.
 	
 -------------------------------------------------------------------------------
+Mon Jun 12 19:18:56 PDT 2000	Michael Jennings <mej@eterm.org>
+
+	Fixed an old rxvt bug in the handling of "\e[0m".  I *really* wish I
+	had time to rewrite that damned thing.  Such a piece of crap.  Thanks
+	again to Marius Gedminas <mgedmin@takas.lt> for pointing it out.
+	
+-------------------------------------------------------------------------------
diff --git a/src/screen.c b/src/screen.c
index 441804d..c626291 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -520,6 +520,7 @@ void
 scr_rendition(int set, int style)
 {
   unsigned int color;
+  int old_style = rstyle;
 
   D_SCREEN(("scr_rendition(%d, %d) called.\n", set, style));
   if (set) {
@@ -549,7 +550,7 @@ scr_rendition(int set, int style)
 
     switch (style) {
       case ~RS_None:		/* default fg/bg colors */
-	rstyle = DEFAULT_RSTYLE;
+	rstyle = DEFAULT_RSTYLE | (old_style & RS_fontMask);
 	/* FALLTHROUGH */
       case RS_RVid:
 	if (rvideo)