diff --git a/mozilla/xpcom/doc/xpcom-standalone.html b/mozilla/xpcom/doc/xpcom-standalone.html
index 1d8320c70c9..91f53e0b55e 100644
--- a/mozilla/xpcom/doc/xpcom-standalone.html
+++ b/mozilla/xpcom/doc/xpcom-standalone.html
@@ -17,7 +17,7 @@ Standalone XPCOM v 0.5</h2></center>
 <hr WIDTH="100%"></center>
 
 <h3>
-1.0&nbsp; Requirements</h3>
+1.0&nbsp; Overview</h3>
 Standalone XPCOM is a tree configuration, that when built, provides a minimal
 set of libraries (shared mostly) that can be used to get all features of
 XPCOM. The contents of this standalone XPCOM in general are:
@@ -31,45 +31,32 @@ Registry : mozilla/modules/libreg</li>
 <li>
 XPCOM : mozilla/xpcom</li>
 </ul>
-
+<b>NOTE: xpcom apis are not frozen yet. By XPCOM 1.0 release they will
+be.</b>
 <h3>
 2.0&nbsp; Building Standalone XPCOM</h3>
 Here are the instructions for building the Standalone XPCOM on unix:
 <br>&nbsp;
 <ol><b>Step 1 : Pull the sources</b>
 <li>
-<tt>cvs -z 3 co -P -r NSPRPUB_CLIENT_BRANCH mozilla/nsprpub</tt></li>
+<tt>cvs -z 3 co mozilla/client.mk</tt></li>
 
 <li>
-<tt>cvs -z 3 co -P mozilla/modules/libreg</tt></li>
+<tt>cd mozilla</tt></li>
 
 <li>
-<tt>cvs -z 3 co -P mozilla/xpcom</tt></li>
-
-<li>
-<tt>cvs -z 3 co -P mozilla/allmakefiles.sh mozilla/client.mk mozilla/aclocal.m4
-mozilla/configure mozilla/configure.in mozilla/Makefile.in mozilla/config
-mozilla/build</tt></li>
+<tt>gmake -f client.mk pull_all BUILD_MODULES=xpcom</tt></li>
 </ol>
 
-<ol>&nbsp;
-<br><b>Step 2 : Building XPCOM Standalone (unix)</b>
+<ol><b>Step 2 : Build XPCOM Standalone (unix)</b>
 <li>
-<tt>cd mozilla; configure --enable-xpcom-standalone</tt></li>
+<tt>configure --enable-module=xpcom</tt></li>
 
 <li>
-<tt>cd config; gmake; cd ..</tt></li>
-
-<li>
-<tt>cd nsprpub; gmake; cd ..</tt></li>
-
-<li>
-<tt>cd modules/libreg; gmake; cd ../..</tt></li>
-
-<li>
-<tt>cd xpcom; gmake; cd ..</tt></li>
+<tt>gmake</tt></li>
 </ol>
-
+<i>Big thanks to Christopher Seawood &lt;cls@seawood.org> for make this
+so simple.</i>
 <h3>
 3.0&nbsp; Testing Standalone XPCOM</h3>
 <tt>xpcom/sample</tt> contains a sample application and a component. This