diff -urN client/src/include/config.h client-new/src/include/config.h
--- client/src/include/config.h	2004-05-13 19:14:52.000000000 +0100
+++ client-new/src/include/config.h	2004-06-13 13:23:55.408837640 +0100
@@ -26,11 +26,11 @@
 #define VERSION_CS 991016
 #define VERSION_SC 991016
 
-#define KEYBIND_FILE "./keys.dat"
-#define OPTION_FILE  "./options.dat"
-#define ARCHDEF_FILE "./archdef.dat"
+#define KEYBIND_FILE GENTOO_STATEDIR "/keys.dat"
+#define OPTION_FILE  GENTOO_STATEDIR "/options.dat"
+#define ARCHDEF_FILE GENTOO_STATEDIR "/archdef.dat"
 
-#define LOG_FILE     "./client.log"
+#define LOG_FILE     GENTOO_STATEDIR "/client.log"
 
 #define CLIENT_ICON_NAME "icon.png"
  
diff -urN client/src/include/main.h client-new/src/include/main.h
--- client/src/include/main.h	2004-05-13 19:14:52.000000000 +0100
+++ client-new/src/include/main.h	2004-06-13 13:33:36.773456784 +0100
@@ -103,16 +103,16 @@
 
 extern int bmaptype_table_size;
 
-#define FILE_DAIMONIN_P0 "./daimonin.p0"
-#define FILE_BMAPS_P0 "./bmaps.p0"
-#define FILE_BMAPS_TMP "./srv_files/bmaps.tmp"
-#define FILE_ANIMS_TMP "./srv_files/anims.tmp"
-
-#define FILE_CLIENT_SPELLS "./srv_files/client_spells"
-#define FILE_CLIENT_SKILLS "./srv_files/client_skills"
-#define FILE_CLIENT_SETTINGS "./srv_files/client_settings"
-#define FILE_CLIENT_BMAPS "./srv_files/client_bmap"
-#define FILE_CLIENT_ANIMS "./srv_files/client_anims"
+#define FILE_DAIMONIN_P0 GENTOO_STATEDIR "/daimonin.p0"
+#define FILE_BMAPS_P0 GENTOO_STATEDIR "/bmaps.p0"
+#define FILE_BMAPS_TMP GENTOO_STATEDIR "/srv_files/bmaps.tmp"
+#define FILE_ANIMS_TMP GENTOO_STATEDIR "/srv_files/anims.tmp"
+
+#define FILE_CLIENT_SPELLS GENTOO_STATEDIR "/srv_files/client_spells"
+#define FILE_CLIENT_SKILLS GENTOO_STATEDIR "/srv_files/client_skills"
+#define FILE_CLIENT_SETTINGS GENTOO_STATEDIR "/srv_files/client_settings"
+#define FILE_CLIENT_BMAPS GENTOO_STATEDIR "/srv_files/client_bmap"
+#define FILE_CLIENT_ANIMS GENTOO_STATEDIR "/srv_files/client_anims"
 
 enum {
 	SRV_CLIENT_SKILLS,
diff -urN client/src/wrapper.c client-new/src/wrapper.c
--- client/src/wrapper.c	2004-05-13 19:14:52.000000000 +0100
+++ client-new/src/wrapper.c	2004-06-13 13:45:34.944278224 +0100
@@ -84,35 +84,35 @@
 char * GetBitmapDirectory(void)
 {
 #if defined( __WIN_32)  || defined(__LINUX)
-	return("./bitmaps/");
+	return(GENTOO_DATADIR "/bitmaps/");
 #endif
 }
 
 char * GetIconDirectory(void)
 {
 #if defined( __WIN_32)  || defined(__LINUX)
-    return("./icons/");
+    return(GENTOO_DATADIR "/icons/");
 #endif
 }
 
 char * GetSfxDirectory(void)
 {
 #if defined( __WIN_32)  || defined(__LINUX)
-	return("./sfx/");
+	return(GENTOO_DATADIR "/sfx/");
 #endif
 }
 
 char * GetCacheDirectory(void)
 {
 #if defined( __WIN_32)  || defined(__LINUX)
-	return("./cache/");
+	return(GENTOO_STATEDIR "/cache/");
 #endif
 }
 
 char * GetGfxUserDirectory(void)
 {
 #if defined( __WIN_32)  || defined(__LINUX)
-	return("./gfx_user/");
+	return(GENTOO_STATEDIR "/gfx_user/");
 #endif
 }
 
@@ -120,7 +120,7 @@
 char * GetMediaDirectory(void)
 {
 #if defined( __WIN_32)  || defined(__LINUX)	
-    return("./media/");
+    return(GENTOO_DATADIR "/media/");
 #endif
 }