diff --git a/mozilla/browser/components/prefwindow/Makefile.in b/mozilla/browser/components/prefwindow/Makefile.in
index e07fb7c964b..bc9ca5c0e0e 100644
--- a/mozilla/browser/components/prefwindow/Makefile.in
+++ b/mozilla/browser/components/prefwindow/Makefile.in
@@ -26,5 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+DIRS = content locale
+
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/browser/components/prefwindow/content/pref-fonts.xul b/mozilla/browser/components/prefwindow/content/pref-fonts.xul
index 75ccfa76bbf..7539a85ac41 100644
--- a/mozilla/browser/components/prefwindow/content/pref-fonts.xul
+++ b/mozilla/browser/components/prefwindow/content/pref-fonts.xul
@@ -312,12 +312,9 @@
   <groupbox>
     <caption label="&someProvColors;"/>
   
-    <radiogroup id="browserUseDocumentColors"
-                preftype="bool" prefstring="browser.display.use_document_colors">
-      <radio value="true" label="&alwaysUseDocumentColors.label;" accesskey="&alwaysUseDocumentColors.accesskey;"/>
-      <radio value="false" label="&useMyColors.label;" accesskey="&useMyColors.accesskey;"/>        
-    </radiogroup>
-    
+    <checkbox id="browserUseDocumentColors" label="&alwaysUseMyColors.label;"
+              accesskey="&alwaysUseMyColors.accesskey;"
+              prefstring="browser.display.use_document_colors"/>
   </groupbox>
 
 </page>
diff --git a/mozilla/browser/components/prefwindow/locale/pref-fonts.dtd b/mozilla/browser/components/prefwindow/locale/pref-fonts.dtd
index 286d210da4b..45d2ebf1dcd 100644
--- a/mozilla/browser/components/prefwindow/locale/pref-fonts.dtd
+++ b/mozilla/browser/components/prefwindow/locale/pref-fonts.dtd
@@ -102,13 +102,9 @@
 <!ENTITY  visitedLinkColor.label          "Visited Links:">
 <!ENTITY  visitedLinkColor.accesskey      "v">
 <!-- LOCALIZATION NOTE (someProvColors): This is the start of a sentence and will be followed by the following radio buttons. -->
-<!ENTITY  someProvColors                  "When a web page provides its own colors and background">
-<!-- LOCALIZATION NOTE (alwaysUseDocColors.label): This is option one, and it appends to 'someProvColors' above. -->
-<!ENTITY  alwaysUseDocumentColors.label   "Always use the colors and background specified by the web page">
-<!ENTITY  alwaysUseDocumentColors.accesskey "a">
+<!ENTITY  alwaysUseMyColors.label         "Always use my chosen colors, ignoring those specified by web sites.">
+<!ENTITY  alwaysUseMyColors.accesskey     "A">
 <!-- LOCALIZATION NOTE (ignoreDocColors.label): This is option two, and it appends to 'someProvColors' above.  -->
-<!ENTITY  useMyColors.label               "Use my chosen colors, ignoring the colors and background image specified">
-<!ENTITY  useMyColors.accesskey           "i">
 <!ENTITY  viewsource                      "View Source Window">
 <!ENTITY  syntaxHighlight.label           "Enable syntax highlighting">
 <!ENTITY  syntaxHighlight.accesskey       "e">