diff -Nuar coda-6.9.2.old/coda-src/scripts/venus-setup.in coda-6.9.2/coda-src/scripts/venus-setup.in
--- coda-6.9.2.old/coda-src/scripts/venus-setup.in	2007-07-20 14:34:49.000000000 -0700
+++ coda-6.9.2/coda-src/scripts/venus-setup.in	2007-09-18 15:01:44.000000000 -0700
@@ -65,16 +65,16 @@
 #fi
 
 # default paths
-errorlog=/usr/coda/etc/console
-cachedir=/usr/coda/venus.cache
-checkpointdir=/usr/coda/spool
-logfile=/usr/coda/etc/venus.log
-marinersocket=/usr/coda/spool/mariner
-pid_file=/usr/coda/venus.cache/pid
-run_control_file=/usr/coda/venus.cache/VENUS_CTRL
-rvm_log=/usr/coda/LOG
-rvm_data=/usr/coda/DATA
-mountpoint=/coda
+errorlog=/var/lib/coda/etc/console
+cachedir=/var/lib/coda/venus.cache
+checkpointdir=/var/lib/coda/spool
+logfile=/var/lib/coda/etc/venus.log
+marinersocket=/var/lib/coda/spool/mariner
+pid_file=/var/lib/coda/venus.cache/pid
+run_control_file=/var/lib/coda/venus.cache/VENUS_CTRL
+rvm_log=/var/lib/coda/LOG
+rvm_data=/var/lib/coda/DATA
+mountpoint=/mnt/coda
 
 # override with user defined paths
 if [ x${conf} != x/dev/null ] ; then
diff -Nuar coda-6.9.2.old/coda-src/scripts/vice-setup-rvm.in coda-6.9.2/coda-src/scripts/vice-setup-rvm.in
--- coda-6.9.2.old/coda-src/scripts/vice-setup-rvm.in	2006-09-19 10:35:02.000000000 -0700
+++ coda-6.9.2/coda-src/scripts/vice-setup-rvm.in	2007-09-18 15:01:44.000000000 -0700
@@ -42,7 +42,7 @@
 #
 
 # defaults, will be overridden by settings in the server.conf file
-vicedir=/vice
+vicedir=/var/lib/vice
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
diff -Nuar coda-6.9.2.old/coda-src/scripts/vice-setup-srvdir coda-6.9.2/coda-src/scripts/vice-setup-srvdir
--- coda-6.9.2.old/coda-src/scripts/vice-setup-srvdir	2005-09-01 14:59:24.000000000 -0700
+++ coda-6.9.2/coda-src/scripts/vice-setup-srvdir	2007-09-18 15:03:20.000000000 -0700
@@ -73,15 +73,15 @@
     echo
     
     if [ $numservers -gt 1 ]; then
-	echon "Where shall we store your file data for server $n ($hn) [/vicepa]? "
+	echon "Where shall we store your file data for server $n ($hn) [/mnt/vicepa]? "
     else
-	echon 'Where shall we store your file data [/vicepa]? '
+	echon 'Where shall we store your file data [/mnt/vicepa]? '
     fi
     srvdir=
     read srvdir
 
     if [ "x$srvdir" = x ]; then
-	srvdir=/vicepa
+	srvdir=/mnt/vicepa
     fi
 
     # Create the directory if needed.  (Symlink is OK.)
diff -Nuar coda-6.9.2.old/coda-src/scripts/vice-setup.in coda-6.9.2/coda-src/scripts/vice-setup.in
--- coda-6.9.2.old/coda-src/scripts/vice-setup.in	2007-07-20 14:34:49.000000000 -0700
+++ coda-6.9.2/coda-src/scripts/vice-setup.in	2007-09-18 15:01:44.000000000 -0700
@@ -122,12 +122,12 @@
   fi
 fi
 
-echon "What is the root directory for your coda server(s)? [/vice] "
+echon "What is the root directory for your coda server(s)? [/var/lib/vice] "
 vicedir=""
 read vicedir
 
 if [ "x$vicedir" = x ] ; then
-   vicedir=/vice
+   vicedir=/var/lib/vice
 fi
 
 if [ $mkconf = 1 ] ; then
diff -Nuar coda-6.9.2.old/coda-src/venus/venus.conf.ex coda-6.9.2/coda-src/venus/venus.conf.ex
--- coda-6.9.2.old/coda-src/venus/venus.conf.ex	2007-04-10 12:24:19.000000000 -0700
+++ coda-6.9.2/coda-src/venus/venus.conf.ex	2007-09-18 15:01:44.000000000 -0700
@@ -20,7 +20,7 @@
 # Which file is used for realm lookups, before we look at dns SRV and A
 # records.
 #
-#realmtab=/etc/coda/realms
+realmtab=/etc/coda/realms
 
 #
 # What should the size of the local cache be in 1k blocks. If this is
@@ -57,7 +57,7 @@
 # Which file should receive venus's stderr output.
 # (default is /usr/coda/etc/console).
 #
-#errorlog=/usr/coda/etc/console
+errorlog=/var/lib/coda/etc/console
 
 #
 # What is the uid of the primary user of this system. The primary user
@@ -79,36 +79,36 @@
 # have an existing filesystem, as you WILL lose all data during
 # initialization.
 #
-#rvm_log=/usr/coda/LOG
-#rvm_data=/usr/coda/DATA
+rvm_log=/var/lib/coda/LOG
+rvm_data=/var/lib/coda/DATA
 
 #
 # Where should venus keep it's pool of cached files.
 # (default is /usr/coda/venus.cache)
 #
-#cachedir=/usr/coda/venus.cache
+cachedir=/var/lib/coda/venus.cache
 
 #
 # Where should venus store snapshots of the modification logs. This is
 # primarily to provide some safe fallback when venus dies or messes up
 # the CML during reintegration. (default is /usr/coda/spool)
 #
-#checkpointdir=/usr/coda/spool
+checkpointdir=/var/lib/coda/spool
 
 #
 # Where does venus store it's pidfile
 #
-#pid_file=/usr/coda/venus.cache/pid
+pid_file=/var/lib/coda/venus.cache/pid
 
 #
 # What file does vutil use to control venus
 #
-#run_control_file=/usr/coda/venus.cache/VENUS_CTRL
+run_control_file=/var/lib/coda/venus.cache/VENUS_CTRL
 
 #
 # Venus log file
 #
-#logfile=/usr/coda/etc/venus.log
+logfile=/var/lib/coda/etc/venus.log
 
 #
 # Mariner socket,
@@ -116,7 +116,7 @@
 # codacon and spy use to talk to venus. On other platforms they will
 # connect to venus through tcp port 2430.
 #
-#marinersocket=/usr/coda/spool/mariner
+marinersocket=/var/lib/coda/spool/mariner
 
 #
 # Dont use RVM,
@@ -271,3 +271,12 @@
 #
 #isr=0
 
+# Mountpoint,
+# Where the coda filesystem is mounted, many application still depend on
+# this being /coda. I am unsure whether it matters much on Windows95/98,
+# but we normally use N: for those.
+#
+#mountpoint=N:
+#mountpoint=/mnt/coda
+mountpoint=/mnt/coda
+
diff -Nuar coda-6.9.2.old/coda-src/vice/server.conf.ex coda-6.9.2/coda-src/vice/server.conf.ex
--- coda-6.9.2.old/coda-src/vice/server.conf.ex	2007-06-26 09:18:19.000000000 -0700
+++ coda-6.9.2/coda-src/vice/server.conf.ex	2007-09-18 15:01:44.000000000 -0700
@@ -11,7 +11,7 @@
 #
 # Prefix of server tree
 #
-#vicedir=/vice
+#vicedir=/var/lib/vice
 
 #
 # Should the server use private mmaps for RVM