diff --git a/build/mac/build_scripts/MozillaBuildList.pm b/build/mac/build_scripts/MozillaBuildList.pm
index e4182e79ffd5..cb90c4c77941 100644
--- a/build/mac/build_scripts/MozillaBuildList.pm
+++ b/build/mac/build_scripts/MozillaBuildList.pm
@@ -192,7 +192,7 @@ sub InstallNonChromeResources()
     #// Make aliases of resource files
     #//
     
-    MakeAlias(":mozilla:content:xml:content:src:xhtml11.dtd",                          "$dist_dir"."dtd:");
+    MakeAlias(":mozilla:content:xml:content:src:xhtml11.dtd",                          "$dist_dir"."res:dtd:");
     
     if (! $main::options{mathml})
     {
diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in
index d3efcba2701b..ea1e148cf2f3 100644
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -68,4 +68,4 @@ EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/xhtml11.dtd \
 		$(NULL)
 libs::
-	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/dtd
+	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/res/dtd
diff --git a/content/xml/content/src/makefile.win b/content/xml/content/src/makefile.win
index 0d3c325023cf..dd63eeb6d2c5 100644
--- a/content/xml/content/src/makefile.win
+++ b/content/xml/content/src/makefile.win
@@ -63,7 +63,8 @@ include <$(DEPTH)\config\rules.mak>
 
 libs:: $(LIBRARY)
 	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-	$(MAKE_INSTALL) xhtml11.dtd $(DIST)\bin\dtd
+	$(MAKE_INSTALL) xhtml11.dtd $(DIST)\bin\res\dtd
 
 clobber::
 	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+	rm -f $(DIST)\bin\res\dtd\xhtml11.dtd 
diff --git a/content/xml/document/src/nsFIXptr.cpp b/content/xml/document/src/nsFIXptr.cpp
index 8962b5c2f191..0c47ca4f95d0 100644
--- a/content/xml/document/src/nsFIXptr.cpp
+++ b/content/xml/document/src/nsFIXptr.cpp
@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 /**
- * Implementation for FIXptr, a W3C NOTE.
+ * Implementation for FIXptr, a W3C proposal.
  *
  * http://lists.w3.org/Archives/Public/www-xml-linking-comments/2001AprJun/att-0074/01-NOTE-FIXptr-20010425.htm
  *
diff --git a/content/xml/document/src/nsFIXptr.h b/content/xml/document/src/nsFIXptr.h
index 307038e240db..eae674759183 100644
--- a/content/xml/document/src/nsFIXptr.h
+++ b/content/xml/document/src/nsFIXptr.h
@@ -39,7 +39,7 @@
 
 
 /**
- * Implementation for FIXptr, a W3C NOTE.
+ * Implementation for FIXptr, a W3C proposal.
  *
  * http://lists.w3.org/Archives/Public/www-xml-linking-comments/2001AprJun/att-0074/01-NOTE-FIXptr-20010425.htm
  *
diff --git a/embedding/config/basebrowser-unix b/embedding/config/basebrowser-unix
index 2f087d53922b..3df935c8d59c 100644
--- a/embedding/config/basebrowser-unix
+++ b/embedding/config/basebrowser-unix
@@ -119,7 +119,7 @@ components/jsurl.xpt
 
 ; layout
 components/libgkcontent.so
-dtd/*
+res/dtd/*
 components/libgklayout.so                   
 components/libhtmlpars.so                 
 components/libgkview.so                   
diff --git a/embedding/config/basebrowser-win b/embedding/config/basebrowser-win
index 1536c10c22ee..dbbf6da33e0d 100644
--- a/embedding/config/basebrowser-win
+++ b/embedding/config/basebrowser-win
@@ -127,7 +127,7 @@ components\jsurl.xpt
 
 ; layout
 components\gkcontent.dll
-dtd\*
+res\dtd\*
 components\gklayout.dll                   
 components\gkparser.dll                 
 components\gkview.dll                   
diff --git a/extensions/xmlextras/pointers/src/nsFIXptr.cpp b/extensions/xmlextras/pointers/src/nsFIXptr.cpp
index 8962b5c2f191..0c47ca4f95d0 100644
--- a/extensions/xmlextras/pointers/src/nsFIXptr.cpp
+++ b/extensions/xmlextras/pointers/src/nsFIXptr.cpp
@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 /**
- * Implementation for FIXptr, a W3C NOTE.
+ * Implementation for FIXptr, a W3C proposal.
  *
  * http://lists.w3.org/Archives/Public/www-xml-linking-comments/2001AprJun/att-0074/01-NOTE-FIXptr-20010425.htm
  *
diff --git a/extensions/xmlextras/pointers/src/nsFIXptr.h b/extensions/xmlextras/pointers/src/nsFIXptr.h
index 307038e240db..eae674759183 100644
--- a/extensions/xmlextras/pointers/src/nsFIXptr.h
+++ b/extensions/xmlextras/pointers/src/nsFIXptr.h
@@ -39,7 +39,7 @@
 
 
 /**
- * Implementation for FIXptr, a W3C NOTE.
+ * Implementation for FIXptr, a W3C proposal.
  *
  * http://lists.w3.org/Archives/Public/www-xml-linking-comments/2001AprJun/att-0074/01-NOTE-FIXptr-20010425.htm
  *
diff --git a/htmlparser/src/nsExpatDriver.cpp b/htmlparser/src/nsExpatDriver.cpp
index daa0c8188673..1da0240db4c9 100644
--- a/htmlparser/src/nsExpatDriver.cpp
+++ b/htmlparser/src/nsExpatDriver.cpp
@@ -52,7 +52,7 @@
 #include "nsTextFormatter.h"
 
 static const PRUint32 kNotInDoctype = PRUint32(-1);
-static const char* kDTDDirectory = "dtd/";
+static const char* kDTDDirectory = "res/dtd/";
 
 /***************************** EXPAT CALL BACKS *******************************/
 
@@ -436,10 +436,9 @@ RemapDTD(const XML_Char* aPublicID, nsAWritableCString& aLocalDTD)
 }
 
 // aDTD is an in/out parameter.  Returns true if the aDTD is a chrome url or if the
-// filename contained within the url exists in the special DTD directory ("dtd"
-// relative to the current process directory).  For the latter case, aDTD is set
-// to the file: url that points to the DTD file found in the local DTD directory
-// AND the old URI is relased.
+// filename contained within the url exists in the special DTD directory.  
+// For the latter case, aDTD is set to the file: url that points to the DTD 
+// file found in the local DTD directory AND the old URI is relased.
 static PRBool
 IsLoadableDTD(const XML_Char* aFPIStr, nsCOMPtr<nsIURI>* aDTD)
 {
diff --git a/layout/mathml/content/src/Makefile.in b/layout/mathml/content/src/Makefile.in
index dabb864a00e4..ca8f422010a7 100644
--- a/layout/mathml/content/src/Makefile.in
+++ b/layout/mathml/content/src/Makefile.in
@@ -59,6 +59,6 @@ EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/mathml.dtd \
 		$(NULL)
 libs::
-	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/dtd
+	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/res/dtd
 	$(INSTALL) $(srcdir)/mathml.css $(DIST)/bin/res
 	$(PERL) $(srcdir)/mathml-css.pl $(DIST)/bin/res/ua.css
diff --git a/layout/mathml/content/src/makefile.win b/layout/mathml/content/src/makefile.win
index 610fcbf98183..0822f77cb156 100644
--- a/layout/mathml/content/src/makefile.win
+++ b/layout/mathml/content/src/makefile.win
@@ -51,11 +51,11 @@ libs:: $(LIBRARY)
 	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
 
 libs::
-	$(MAKE_INSTALL) mathml.dtd $(DIST)\bin\dtd
+	$(MAKE_INSTALL) mathml.dtd $(DIST)\bin\res\dtd
 	$(MAKE_INSTALL) mathml.css $(DIST)\bin\res
 	$(PERL) mathml-css.pl $(DIST)\bin\res\ua.css
 
 clobber::
 	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-	rm -f $(DIST)\bin\dtd\mathml.dtd
+	rm -f $(DIST)\bin\res\dtd\mathml.dtd
 	rm -f $(DIST)\bin\res\mathml.css
diff --git a/layout/svg/base/src/Makefile.in b/layout/svg/base/src/Makefile.in
index 47230e2ee130..d4c90555a412 100644
--- a/layout/svg/base/src/Makefile.in
+++ b/layout/svg/base/src/Makefile.in
@@ -93,4 +93,4 @@ EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/svg.dtd \
 		$(NULL)
 libs::
-	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/dtd
+	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/res/dtd
diff --git a/layout/svg/base/src/makefile.win b/layout/svg/base/src/makefile.win
index bd86da5d46c3..46cd9a23bce5 100644
--- a/layout/svg/base/src/makefile.win
+++ b/layout/svg/base/src/makefile.win
@@ -87,11 +87,11 @@ include <$(DEPTH)\config\rules.mak>
 
 libs:: $(LIBRARY)
 	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-	$(MAKE_INSTALL) svg.dtd $(DIST)\bin\dtd
+	$(MAKE_INSTALL) svg.dtd $(DIST)\bin\res\dtd
 	$(MAKE_INSTALL) svg.css $(DIST)\bin\res
 	$(PERL) install-svg-css.pl $(DIST)\bin\res\ua.css
 
 clobber::
 	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-	rm -f $(DIST)\bin\dtd\svg.dtd
+	rm -f $(DIST)\bin\res\dtd\svg.dtd
 	rm -f $(DIST)\bin\res\svg.css
diff --git a/parser/htmlparser/src/nsExpatDriver.cpp b/parser/htmlparser/src/nsExpatDriver.cpp
index daa0c8188673..1da0240db4c9 100644
--- a/parser/htmlparser/src/nsExpatDriver.cpp
+++ b/parser/htmlparser/src/nsExpatDriver.cpp
@@ -52,7 +52,7 @@
 #include "nsTextFormatter.h"
 
 static const PRUint32 kNotInDoctype = PRUint32(-1);
-static const char* kDTDDirectory = "dtd/";
+static const char* kDTDDirectory = "res/dtd/";
 
 /***************************** EXPAT CALL BACKS *******************************/
 
@@ -436,10 +436,9 @@ RemapDTD(const XML_Char* aPublicID, nsAWritableCString& aLocalDTD)
 }
 
 // aDTD is an in/out parameter.  Returns true if the aDTD is a chrome url or if the
-// filename contained within the url exists in the special DTD directory ("dtd"
-// relative to the current process directory).  For the latter case, aDTD is set
-// to the file: url that points to the DTD file found in the local DTD directory
-// AND the old URI is relased.
+// filename contained within the url exists in the special DTD directory.  
+// For the latter case, aDTD is set to the file: url that points to the DTD 
+// file found in the local DTD directory AND the old URI is relased.
 static PRBool
 IsLoadableDTD(const XML_Char* aFPIStr, nsCOMPtr<nsIURI>* aDTD)
 {
diff --git a/xpinstall/packager/packages-mac b/xpinstall/packager/packages-mac
index 0dc69d96fa50..df14f231ddc5 100644
--- a/xpinstall/packager/packages-mac
+++ b/xpinstall/packager/packages-mac
@@ -246,7 +246,7 @@ viewer:defaults:wallet:DistinguishedSchema.tbl
 viewer:defaults:wallet:SchemaStrings.tbl
 viewer:defaults:wallet:PositionalSchema.tbl
 viewer:defaults:wallet:StateSchema.tbl
-viewer:dtd:*
+viewer:res:dtd:*
 viewer:res:html:*
 viewer:res:html.css
 viewer:res:quirk.css
diff --git a/xpinstall/packager/packages-static-unix b/xpinstall/packager/packages-static-unix
index 2366ea9d58fd..467ff3656055 100644
--- a/xpinstall/packager/packages-static-unix
+++ b/xpinstall/packager/packages-static-unix
@@ -207,7 +207,7 @@ bin/res/rdf/folder-open.gif
 bin/res/rdf/loading.gif
 bin/res/ua.css
 bin/res/forms.css
-bin/dtd/*
+bin/res/dtd/*
 ;debug menus reference samples dir - remove for actual releases:
 bin/res/samples/*
 bin/res/builtin/htmlBindings.xml
diff --git a/xpinstall/packager/packages-static-win b/xpinstall/packager/packages-static-win
index 98025b158ab1..4f19c618d3f4 100644
--- a/xpinstall/packager/packages-static-win
+++ b/xpinstall/packager/packages-static-win
@@ -207,7 +207,7 @@ bin\res\loading-image.gif
 bin\res\broken-image.gif
 bin\res\html\*
 bin\res\fonts\*
-bin\dtd\*
+bin\res\dtd\*
 bin\defaults\wallet\VcardSchema.tbl
 bin\defaults\wallet\FieldSchema.tbl
 bin\defaults\wallet\SchemaConcat.tbl
diff --git a/xpinstall/packager/packages-unix b/xpinstall/packager/packages-unix
index c8288a066a07..0b0319dd0db4 100644
--- a/xpinstall/packager/packages-unix
+++ b/xpinstall/packager/packages-unix
@@ -296,7 +296,7 @@ bin/res/rdf/folder-open.gif
 bin/res/rdf/loading.gif
 bin/res/ua.css
 bin/res/forms.css
-bin/dtd/*
+bin/res/dtd/*
 ;debug menus reference samples dir - remove for actual releases:
 bin/res/samples/*
 bin/res/builtin/htmlBindings.xml
diff --git a/xpinstall/packager/packages-win b/xpinstall/packager/packages-win
index 6913cb000221..1f38bc9e1121 100644
--- a/xpinstall/packager/packages-win
+++ b/xpinstall/packager/packages-win
@@ -294,7 +294,7 @@ bin\res\loading-image.gif
 bin\res\broken-image.gif
 bin\res\html\*
 bin\res\fonts\*
-bin\dtd\*
+bin\res\dtd\*
 bin\defaults\wallet\VcardSchema.tbl
 bin\defaults\wallet\FieldSchema.tbl
 bin\defaults\wallet\SchemaConcat.tbl