diff --git a/extensions/irc/xul/content/prefpanel/appearance-previewCSS.xul b/extensions/irc/xul/content/prefpanel/appearance-previewCSS.xul
index 2135a308f290..1f96470ab1bb 100644
--- a/extensions/irc/xul/content/prefpanel/appearance-previewCSS.xul
+++ b/extensions/irc/xul/content/prefpanel/appearance-previewCSS.xul
@@ -32,7 +32,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
diff --git a/extensions/irc/xul/content/prefpanel/appearance.xul b/extensions/irc/xul/content/prefpanel/appearance.xul
index d9b9460c5f8c..dea124fd8797 100644
--- a/extensions/irc/xul/content/prefpanel/appearance.xul
+++ b/extensions/irc/xul/content/prefpanel/appearance.xul
@@ -33,7 +33,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://chatzilla/content/prefpanel/appearance.css" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
+<!DOCTYPE page SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Init();"
diff --git a/extensions/irc/xul/content/prefpanel/interface.xul b/extensions/irc/xul/content/prefpanel/interface.xul
index 579591d3f89e..e26db41670bd 100644
--- a/extensions/irc/xul/content/prefpanel/interface.xul
+++ b/extensions/irc/xul/content/prefpanel/interface.xul
@@ -32,7 +32,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
+<!DOCTYPE page SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Init();"
diff --git a/extensions/irc/xul/content/prefpanel/pref-irc.xul b/extensions/irc/xul/content/prefpanel/pref-irc.xul
index 69f26b6a0b60..5ec93eb0b8c4 100644
--- a/extensions/irc/xul/content/prefpanel/pref-irc.xul
+++ b/extensions/irc/xul/content/prefpanel/pref-irc.xul
@@ -32,7 +32,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
+<!DOCTYPE page SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="parent.initPanel('chrome://chatzilla/content/prefpanel/pref-irc.xul');"
diff --git a/extensions/irc/xul/content/prefpanel/sound.xul b/extensions/irc/xul/content/prefpanel/sound.xul
index 5aff4e9348ce..6eed83df38b4 100644
--- a/extensions/irc/xul/content/prefpanel/sound.xul
+++ b/extensions/irc/xul/content/prefpanel/sound.xul
@@ -32,7 +32,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
+<!DOCTYPE page SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       headertitle="&sound.window.title;" onload="Init();">
diff --git a/extensions/irc/xul/content/prefpanel/stalk.xul b/extensions/irc/xul/content/prefpanel/stalk.xul
index 703699aa9106..5de37219bda2 100644
--- a/extensions/irc/xul/content/prefpanel/stalk.xul
+++ b/extensions/irc/xul/content/prefpanel/stalk.xul
@@ -32,7 +32,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
+<!DOCTYPE page SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Init();"
diff --git a/extensions/irc/xul/content/prefpanel/startup.xul b/extensions/irc/xul/content/prefpanel/startup.xul
index b32003be1c6b..c17f2fa68a52 100644
--- a/extensions/irc/xul/content/prefpanel/startup.xul
+++ b/extensions/irc/xul/content/prefpanel/startup.xul
@@ -32,7 +32,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
+<!DOCTYPE page SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Init();"
diff --git a/extensions/irc/xul/content/prefpanel/tabs.xul b/extensions/irc/xul/content/prefpanel/tabs.xul
index b046acb7bd7a..ebcecbbf9e60 100644
--- a/extensions/irc/xul/content/prefpanel/tabs.xul
+++ b/extensions/irc/xul/content/prefpanel/tabs.xul
@@ -37,7 +37,7 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
+<!DOCTYPE page SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="parent.initPanel('chrome://chatzilla/content/prefpanel/tabs.xul');"
diff --git a/extensions/irc/xul/content/prefpanel/text.xul b/extensions/irc/xul/content/prefpanel/text.xul
index 73ad2b2e7823..3b5a25153276 100644
--- a/extensions/irc/xul/content/prefpanel/text.xul
+++ b/extensions/irc/xul/content/prefpanel/text.xul
@@ -31,7 +31,7 @@
    -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
+<!DOCTYPE page SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="parent.initPanel('chrome://chatzilla/content/prefpanel/text.xul');"
diff --git a/extensions/irc/xul/content/prefsOverlay.xul b/extensions/irc/xul/content/prefsOverlay.xul
index 67aa21f2c2c5..feb2697bf2bd 100644
--- a/extensions/irc/xul/content/prefsOverlay.xul
+++ b/extensions/irc/xul/content/prefsOverlay.xul
@@ -31,7 +31,7 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!DOCTYPE window SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
 
 <overlay id="ovCZPrefs" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">