diff -urN catalyst-2.0_rc39.orig/catalyst catalyst-2.0_rc39/catalyst
--- catalyst-2.0_rc39.orig/catalyst	2005-12-20 07:07:45.000000000 -0500
+++ catalyst-2.0_rc39/catalyst	2005-12-20 07:09:19.000000000 -0500
@@ -51,10 +51,10 @@
 	myconf={}
 	config_file=""
 
-	confdefaults={ "storedir":"/var/tmp/catalyst",\
-		"sharedir":"/usr/share/catalyst","distdir":"/usr/portage/distfiles",\
+	confdefaults={ "storedir":"/var/tmp/catalyst2",\
+		"sharedir":"/usr/share/catalyst2","distdir":"/usr/portage/distfiles",\
 		"portdir":"/usr/portage","options":"",\
-		"snapshot_cache":"/var/tmp/catalyst/snapshot_cache",\
+		"snapshot_cache":"/var/tmp/catalyst2/snapshot_cache",\
 		"hash_function":"crc32"}
 		
 	# first, try the one passed (presumably from the cmdline)
@@ -69,9 +69,9 @@
 			sys.exit(1)
 	
 	# next, try the default location
-	elif os.path.exists("/etc/catalyst/catalyst.conf"):
-		print "Using default Catalyst configuration file, /etc/catalyst/catalyst.conf"
-		config_file="/etc/catalyst/catalyst.conf"
+	elif os.path.exists("/etc/catalyst2/catalyst2.conf"):
+		print "Using default Catalyst configuration file, /etc/catalyst2/catalyst2.conf"
+		config_file="/etc/catalyst2/catalyst2.conf"
 	
 	# can't find a config file (we are screwed), so bail out
 	else: