diff --git a/webtools/lxr/lxr.conf b/webtools/lxr/lxr.conf
index 9652c7506df7..88183f75d35b 100644
--- a/webtools/lxr/lxr.conf
+++ b/webtools/lxr/lxr.conf
@@ -31,13 +31,14 @@ sourcedirhead: template-sourcedir-head
 
 # If we're indexing more than one tree then include one sourceroot
 # entry per tree where each entry is a tree/directory pair.
-sourceroot: classic /export2/lxr-data/classic/mozilla
-sourceroot: ef /export2/lxr-data/ef/mozilla
-sourceroot: mozilla /export2/lxr-data/mozilla/mozilla
-sourceroot: nspr /export2/lxr-data/nspr/mozilla
-sourceroot: seamonkey /export2/lxr-data/seamonkey/mozilla
-sourceroot: grendel /export2/lxr-data/grendel/mozilla
-sourceroot: gnome /export2/lxr-data/gnome/gnome
+sourceroot: classic /lxr-root/lxr-data/classic/mozilla
+sourceroot: ef /lxr-root/lxr-data/ef/mozilla
+sourceroot: mozilla /lxr-root/lxr-data/mozilla/mozilla
+sourceroot: nspr /lxr-root/lxr-data/nspr/mozilla
+sourceroot: seamonkey /lxr-root/lxr-data/seamonkey/mozilla
+sourceroot: m10 /lxr-root/lxr-data/m10/mozilla
+sourceroot: grendel /lxr-root/lxr-data/grendel/mozilla
+sourceroot: gnome /lxr-root/lxr-data/gnome/gnome
 
 # name of the source.
 srcrootname: mozilla
@@ -53,11 +54,11 @@ incprefix: /include
 #dbdir: /opt/lxr-data/db
 
 # If using multiple trees, give the parent directory containing
-# dirs for each tree. For mozilla, /export/lxr-data contains
+# dirs for each tree. For mozilla, /lxr-root/lxr-data contains
 # a directory for each tree. Each of these directories contains
 # the tree's databases, and a mozilla directory containing the
 # source.
-dbdir: /export2/lxr-data
+dbdir: /lxr-root/lxr-data
 
 # Glimpse can be found here.
 glimpsebin: /opt/local/bin/glimpse
diff --git a/webtools/lxr/update-lxr.sh b/webtools/lxr/update-lxr.sh
index 92b6100fcbfb..d928bd6cb4f0 100755
--- a/webtools/lxr/update-lxr.sh
+++ b/webtools/lxr/update-lxr.sh
@@ -6,7 +6,7 @@
 # Updated 3-6-99 by endico. Combine src, xref and source files 
 #    together into one script.
 
-CVSROOT=/cvsroot
+CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 export CVSROOT
 
 PATH=/opt/local/bin:/opt/cvs-tools/bin:/usr/ucb:$PATH
@@ -83,16 +83,26 @@ case "$1" in
     time cvs -Q -d $CVSROOT checkout -P SeaMonkeyAll
     ;;
 'gnome')
-    CVSROOT=/cvs/gnome
+    CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvs/gnome
     export CVSROOT
     time cvs -Q -d $CVSROOT checkout -P gnome
     ;;
 esac
 
-
 date
 uptime
 
+if [ -f $db_dir/update.log ]
+  then
+  ERROR=`grep [server aborted] $db_dir/update.log`
+  if [ "$ERROR"  != "" ]
+    then
+    echo $ERROR | mail -s "lxr: cvs server aborted" root
+    exit
+    fi
+  fi
+
+
 #
 # generate cross reference database
 #