diff -ur old/gnunet-0.3.3/contrib/gnunet.conf.root gnunet-0.3.3/contrib/gnunet.conf.root
--- old/gnunet-0.3.3/contrib/gnunet.conf.root	Sat May 25 08:20:36 2002
+++ gnunet-0.3.3/contrib/gnunet.conf.root	Sat May 25 08:09:13 2002
@@ -20,7 +20,7 @@
 # may be a good choice.
 # GNUNET_HOME	= ~/.gnunet
 # For root, choose this:
-GNUNET_HOME     = /var/GNUnet
+GNUNET_HOME     = /var/lib/gnunet
 
 
 
diff -ur old/gnunet-0.3.3/contrib/updatehosts gnunet-0.3.3/contrib/updatehosts
--- old/gnunet-0.3.3/contrib/updatehosts	Mon Mar 25 10:17:13 2002
+++ gnunet-0.3.3/contrib/updatehosts	Sat May 25 08:45:31 2002
@@ -1,7 +1,8 @@
-#!/bin/sh
-mkdir -p $HOME/.gnunet/data/hosts
-cd $HOME/.gnunet/data/hosts
-wget http://gecko.cs.purdue.edu/gnet/hosts.tar.gz
-tar xvfz hosts.tar.gz
-rm -f hosts.tar.gz
-chmod 644 $HOME/.gnunet/data/hosts/*
+#!/bin/sh -e
+
+if test '$1' = '-h' ; then GNUNET_HOME='$2' ; else GNUNET_HOME='~/.gnunet' ; fi
+
+mkdir -p $GNUNET_HOME/data/hosts
+cd $GNUNET_HOME/data/hosts
+wget -c -t 20 http://www.ovmj.org/GNUnet/hosts.tar.gz -O - | tar -xvzf -
+chmod 644 $GNUNET_HOME/data/hosts/*