diff --git a/docs/CFEBuildInstrs.html b/docs/CFEBuildInstrs.html
index 6fb989a04d9..6513a9fdcac 100644
--- a/docs/CFEBuildInstrs.html
+++ b/docs/CFEBuildInstrs.html
@@ -231,9 +231,9 @@ libgcc.a library, which you can find by running
   These are the commands you need.</p>
 <pre>
  % gmake
- % mkdir $CFEINSTALL/bytecode-libs
+ % mkdir $CFEINSTALL/lib
  % gmake -C runtime install-bytecode
- % setenv LLVM_LIB_SEARCH_PATH $CFEINSTALL/bytecode-libs
+ % setenv LLVM_LIB_SEARCH_PATH $CFEINSTALL/lib
 </pre></li>
 
 <li><p>Optionally, build a symbol table for the newly installed runtime 
diff --git a/docs/FAQ.html b/docs/FAQ.html
index e43e3b22a57..9db6cc7d182 100644
--- a/docs/FAQ.html
+++ b/docs/FAQ.html
@@ -364,10 +364,10 @@ environment variable does not contain the libcrtend.a library.
 To fix it, verify that LLVM_LIB_SEARCH_PATH points to the correct directory
 and that libcrtend.a is inside.  For pre-built LLVM GCC front ends, this
 should be the absolute path to
-<tt>cfrontend/&lt;<i>platform</i>&gt;/llvm-gcc/bytecode-libs</tt>.  If you've
+<tt>cfrontend/&lt;<i>platform</i>&gt;/llvm-gcc/lib</tt>.  If you've
 built your own LLVM GCC front end, then ensure that you've built and installed
 the libraries in <tt>llvm/runtime</tt> and have LLVM_LIB_SEARCH_PATH pointing
-to the <tt>LLVMGCCDIR/bytecode-libs</tt> subdirectory.
+to the <tt>$LLVMGCCDIR/lib</tt> subdirectory.
 </p>
 </div>
 
@@ -460,7 +460,7 @@ find libcrtend.a.
 <p>
 In order to find libcrtend.a, you must have the directory in which it lives in
 your LLVM_LIB_SEARCH_PATH environment variable.  For the binary distribution of
-the LLVM GCC front end, this will be the full path of the bytecode-libs
+the LLVM GCC front end, this will be the full path of the <tt>lib</tt>
 directory inside of the LLVM GCC distribution.
 </p>
 </div>
diff --git a/docs/GettingStarted.html b/docs/GettingStarted.html
index ef561f6416a..e57defd27ca 100644
--- a/docs/GettingStarted.html
+++ b/docs/GettingStarted.html
@@ -548,7 +548,7 @@ You can set these on the command line, or better yet, set them in your
 <tt>.cshrc</tt> or <tt>.profile</tt>.
 
 <dl>
-    <dt><tt>LLVM_LIB_SEARCH_PATH</tt>=<tt><i>LLVMGCCDIR</i>/bytecode-libs</tt>
+    <dt><tt>LLVM_LIB_SEARCH_PATH</tt>=<tt><i>LLVMGCCDIR</i>/lib</tt>
     <dd>
     This environment variable helps the LLVM GCC front end find bytecode
     libraries that it will need for compilation.
@@ -806,10 +806,10 @@ script to configure the build system:</p>
 <tt>LLVM_LIB_SEARCH_PATH</tt> environment variable in your startup shell 
 scripts.  This environment variable is used to locate "system" libraries like
 "<tt>-lc</tt>" and "<tt>-lm</tt>" when linking.  This variable should be set to
-the absolute path of the <tt>bytecode-libs</tt> subdirectory of the GCC front
-end, or <i>LLVMGCCDIR</i>/<tt>bytecode-libs</tt>.  For example, one might set
+the absolute path of the <tt>lib</tt> subdirectory of the GCC front
+end, or <i>LLVMGCCDIR</i>/<tt>lib</tt>.  For example, one might set
 <tt>LLVM_LIB_SEARCH_PATH</tt> to
-<tt>/home/vadve/lattner/local/x86/llvm-gcc/bytecode-libs</tt> for the x86
+<tt>/home/vadve/lattner/local/x86/llvm-gcc/lib</tt> for the x86
 version of the GCC front end on our research machines.</p>
 
 </div>
diff --git a/docs/TestingGuide.html b/docs/TestingGuide.html
index ca48bd46d24..1ebe0b54242 100644
--- a/docs/TestingGuide.html
+++ b/docs/TestingGuide.html
@@ -474,7 +474,7 @@ file.  We usually run it from a crontab entry that looks ilke this:
 </p>
 
 <pre>
-5 3 * * *       LLVM_LIB_SEARCH_PATH=.../llvm-gcc/bytecode-libs $HOME/llvm/utils/NightlyTest.pl -parallel -enable-linscan ...CVSREPOSTRING... $HOME/buildtest-X86 $HOME/cvs/testresults-X86
+5 3 * * *       LLVM_LIB_SEARCH_PATH=.../llvm-gcc/lib $HOME/llvm/utils/NightlyTest.pl -parallel -enable-linscan ...CVSREPOSTRING... $HOME/buildtest-X86 $HOME/cvs/testresults-X86
 </pre>
 
 <p>Or, you can create a shell script to encapsulate the running of the script.
@@ -488,7 +488,7 @@ export WEBDIR=$BASE/testresults
 export LLVMGCCDIR=/proj/work/llvm/cfrontend/install
 export PATH=/proj/install/bin:$LLVMGCCDIR/bin:$PATH
 export LD_LIBRARY_PATH=/proj/install/lib
-export LLVM_LIB_SEARCH_PATH=/proj/work/llvm/cfrontend/install/bytecode-libs
+export LLVM_LIB_SEARCH_PATH=/proj/work/llvm/cfrontend/install/lib
 cd $BASE
 cp /proj/work/llvm/llvm/utils/NightlyTest.pl .
 nice ./NightlyTest.pl -nice -release -verbose -parallel -enable-linscan -noexternals