diff -ur src/blacklist.c patched-src/blacklist.c
--- src/blacklist.c	Thu Sep 21 10:26:43 2000
+++ patched-src/blacklist.c	Wed Nov  1 03:55:47 2000
@@ -31,7 +31,7 @@
 #ifdef WIN32
   d=expand_path("blacklist.ini");
 #else
-  d=expand_path("~/.gnut_blacklist");
+  d=expand_path("~/.gnut/blacklist");
 #endif
   if (d) {
 	run_config_file(d, 1, 0);
@@ -97,7 +97,7 @@
 #ifdef WIN32
   f = fopen("blacklist.ini", "w");
 #else
-  d=expand_path("~/.gnut_blacklist");
+  d=expand_path("~/.gnut/blacklist");
   f = fopen(d, "w");
 #endif
   if (f) {
diff -ur src/cli_input.c patched-src/cli_input.c
--- src/cli_input.c	Wed Oct 18 12:04:14 2000
+++ patched-src/cli_input.c	Wed Nov  1 03:54:50 2000
@@ -1985,7 +1985,7 @@
 #endif
 
   g_debug(3,"calling expand_path\n");
-  d=expand_path("~/.gnut_hosts");
+  d=expand_path("~/.gnut/hosts");
   g_debug(3,"calling host_save\n");
   host_save(d);
   g_debug(3,"free'ing mem\n");
@@ -2551,7 +2551,7 @@
   free(cfg);
   
   /* save hosts */
-  tmp = expand_path("~/.gnut_hosts");
+  tmp = expand_path("~/.gnut/hosts");
   host_save(tmp);
   xfree(tmp);
   
diff -ur src/cli_interface.c patched-src/cli_interface.c
--- src/cli_interface.c	Thu Sep 21 10:49:44 2000
+++ patched-src/cli_interface.c	Wed Nov  1 03:54:24 2000
@@ -32,7 +32,7 @@
   printf("Usage gnut [OPTION] ... [HOST] ...\n");
   printf("Client for the Gnutella distributed file sharing network.\n\n");
   printf("  -l [arg]          sets the initial logging level to arg\n");
-  printf("  -c [file]         specify a script to run instead of ~/.gnutrc\n");
+  printf("  -c [file]         specify a script to run instead of ~/.gnut/gnutrc\n");
   printf("  -i [ip/interface] specifies the interface to bind to\n");
   printf("  -p [port]         port to listen on\n");
   printf("  -d                daemon mode, never ask for input\n");
@@ -134,7 +134,7 @@
     run_config_file(d, 0, 0);
     xfree(d);
   } else {
-    d=expand_path("~/.gnutrc");
+    d=expand_path("~/.gnut/gnutrc");
     run_config_file(d, 0, 0);
     xfree(d);
   }
@@ -153,7 +153,7 @@
     run_config_file(d, 1, 0);
     xfree(d);
   } else {
-    d=expand_path("~/.gnutrc");
+    d=expand_path("~/.gnut/gnutrc");
     run_config_file(d, 1, 0);
     xfree(d);
   }
diff -ur src/gnut.c patched-src/gnut.c
--- src/gnut.c	Mon Sep 11 13:07:10 2000
+++ patched-src/gnut.c	Wed Nov  1 03:55:14 2000
@@ -215,7 +215,7 @@
   share_cache_init();
   host_init();
 
-  d=expand_path("~/.gnut_hosts");
+  d=expand_path("~/.gnut/hosts");
   g_debug(2,"trying to restore hosts\n");
 
   host_restore(d);
diff -ur src/host.c patched-src/host.c
--- src/host.c	Mon Sep 18 09:44:28 2000
+++ patched-src/host.c	Wed Nov  1 03:55:31 2000
@@ -148,7 +148,7 @@
   return 0;
 }
 
-/* host_restore loads the host list file (usually ~/.gnut_hosts)
+/* host_restore loads the host list file (usually ~/.gnut/hosts)
  * by calling host_add() on each entry to add the host IPs to the
  * host IP hashtable. */
 int host_restore(char *fname)
@@ -183,17 +183,17 @@
     } else if ((ptr=strchr(buf,':'))) {
       *(ptr++)=0;
     } else {
-      printf("In ~/.gnut_hosts, ignoring %s\n",buf);
+      printf("In ~/.gnut/hosts, ignoring %s\n",buf);
       continue;
     }
     
     if (4 != sscanf(buf,"%i.%i.%i.%i",&a[0],&a[1],&a[2],&a[3])) {
-      printf("In ~/.gnut_hosts, no ip in %s %s",buf,ptr);
+      printf("In ~/.gnut/hosts, no ip in %s %s",buf,ptr);
       continue;
     }
     
     if (0==(st=atoi(ptr)) && (*ptr != '0')) {
-      printf("In ~/.gnut_hosts, no port in %s %s\n",buf,ptr);
+      printf("In ~/.gnut/hosts, no port in %s %s\n",buf,ptr);
       continue;
     }