diff --git a/webtools/tinderbox2/ChangeLog b/webtools/tinderbox2/ChangeLog
index bf43ecec5663..68933cb19ee8 100644
--- a/webtools/tinderbox2/ChangeLog
+++ b/webtools/tinderbox2/ChangeLog
@@ -1,3 +1,13 @@
+2005-12-01  Mike Taylor <bear@code-bear.com>
+  * src/lib/VCDisplay/ViewCVS.pm
+    updated tinderbox library use statement to have the #tinderbox_libdir#
+    marker instead of hardcoded paths
+    bug 312958
+
+2005-11-25
+  * A pass was made thru many files to correct spelling errors and typos.
+    This was done mozilla-wide.
+
 2005-10-18  Mike Taylor <bear@code-bear.com>
   * ReadMe, Install
     Updated to mention VC_SVN
diff --git a/webtools/tinderbox2/src/lib/VCDisplay/ViewCVS.pm b/webtools/tinderbox2/src/lib/VCDisplay/ViewCVS.pm
index 31c102c8bb8b..90dd7ceae57b 100644
--- a/webtools/tinderbox2/src/lib/VCDisplay/ViewCVS.pm
+++ b/webtools/tinderbox2/src/lib/VCDisplay/ViewCVS.pm
@@ -9,9 +9,9 @@
 # query.  I would add these features into ViewCVS but I can not tell
 # if the project is abandoned or not.
 
-# $Revision: 1.1 $ 
-# $Date: 2003/12/23 13:04:00 $ 
-# $Author: kestes%walrus.com $ 
+# $Revision: 1.2 $ 
+# $Date: 2005/12/01 07:17:12 $ 
+# $Author: bear%code-bear.com $ 
 # $Source: /home/hwine/cvs_conversion/cvsroot/mozilla/webtools/tinderbox2/src/lib/VCDisplay/ViewCVS.pm,v $ 
 # $Name:  $ 
 
@@ -53,13 +53,7 @@ package VCDisplay::ViewCVS;
 
 # Load Tinderbox libraries
 
-use lib '/home2/tbox/local_conf',
-   '/home2/tbox/default_conf',
-   '/home2/tbox/lib',
-   '/root/mozilla/webtools/tinderbox2/./build/local_conf',
-   '/root/mozilla/webtools/tinderbox2/./build/default_conf',
-   '/root/mozilla/webtools/tinderbox2/./build/lib';
-
+use lib '#tinder_libdir#';
 use HTMLPopUp;
 use TreeData;