diff --git a/default.bigchars b/common/default.bigchars
similarity index 100%
rename from default.bigchars
rename to common/default.bigchars
diff --git a/spider.bigchars b/common/spider.bigchars
similarity index 100%
rename from spider.bigchars
rename to common/spider.bigchars
diff --git a/src/config.h.in b/src/config.h.in
index 8f03cb1..9260777 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -292,7 +292,7 @@
 #define BOTDIR				""
 #define MECHBASENAME			"mech"
 
-#define RANDDIR				"common/"
+#define COMMONDIR			"common/"
 #define HELPDIR				"help/"
 #define CFGFILE				BOTDIR MECHBASENAME ".conf"
 #define PIDFILE				BOTDIR MECHBASENAME ".pid"
@@ -301,16 +301,16 @@
 #define TRIVIASCOREFILE			BOTDIR MECHBASENAME ".trivscore"
 #define TEMP				".temp"
 
-#define AWAYFILE 			RANDDIR "away.txt"
-#define NICKSFILE			RANDDIR "nick.txt"
-#define RANDKICKSFILE			RANDDIR "kick.txt"
-#define RANDTOPICSFILE			RANDDIR "say.txt"
-#define RANDSAYFILE 			RANDDIR "say.txt"
-#define RANDINSULTFILE			RANDDIR "insult.txt"
-#define RANDPICKUPFILE			RANDDIR	"pickup.txt"
-#define RAND8BALLFILE			RANDDIR "8ball.txt"
-#define SIGNOFFSFILE			RANDDIR "signoff.txt"
-#define VERSIONFILE			RANDDIR "version.txt"
+#define AWAYFILE 			COMMONDIR "away.txt"
+#define NICKSFILE			COMMONDIR "nick.txt"
+#define RANDKICKSFILE			COMMONDIR "kick.txt"
+#define RANDTOPICSFILE			COMMONDIR "say.txt"
+#define RANDSAYFILE 			COMMONDIR "say.txt"
+#define RANDINSULTFILE			COMMONDIR "insult.txt"
+#define RANDPICKUPFILE			COMMONDIR "pickup.txt"
+#define RAND8BALLFILE			COMMONDIR "8ball.txt"
+#define SIGNOFFSFILE			COMMONDIR "signoff.txt"
+#define VERSIONFILE			COMMONDIR "version.txt"
 
 #define DEFAULT_IRC_PORT		6667
 
diff --git a/src/toybox.c b/src/toybox.c
index b353866..0767802 100644
--- a/src/toybox.c
+++ b/src/toybox.c
@@ -721,7 +721,7 @@ void do_bigsay(COMMAND_ARGS)
 	if (fontname && *rest != '-')
 		goto reuse_font;
 
-	stringcpy(output,BIGSAY_DEFAULTFONT);
+	stringcat(stringcpy(output,COMMONDIR),BIGSAY_DEFAULTFONT);
 
 	if (rest[0] == '-')
 	{
@@ -731,7 +731,7 @@ void do_bigsay(COMMAND_ARGS)
 		else
 		if (STRCHR(temp,'/') == NULL) /* no filesystem perversions... */
 		{
-			stringcat(stringcpy(output,temp+1),".bigchars"); /* temp+1 = skip initial '-' */
+			stringcat(stringcat(stringcpy(output,COMMONDIR),temp+1),".bigchars"); /* temp+1 = skip initial '-' */
 		}
 	}
 #ifdef DEBUG