diff -rupN fuse-0.9.0/settings.pl fuse-0.9.0-pandora/settings.pl
--- fuse-0.9.0/settings.pl	2007-12-21 17:43:53.000000000 +0100
+++ fuse-0.9.0-pandora/settings.pl	2008-11-03 13:40:19.970417300 +0100
@@ -99,7 +99,7 @@ print hashline( __LINE__ ), << 'CODE';
 #ifdef WIN32
 #define CONFIG_FILE_NAME "fuse.cfg"
 #else				/* #ifdef WIN32 */
-#define CONFIG_FILE_NAME ".fuserc"
+#define CONFIG_FILE_NAME "config.xml"
 #endif				/* #ifdef WIN32 */
 
 /* The current settings of options, etc */
@@ -172,7 +172,7 @@ read_config_file( settings_info *setting
 
   home = compat_get_home_path(); if( !home ) return 1;
 
-  snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
+  snprintf( path, 256, "./%s", CONFIG_FILE_NAME );
 
   /* See if the file exists; if doesn't, it's not a problem */
   if( stat( path, &stat_info ) ) {
@@ -276,7 +276,7 @@ settings_write_config( settings_info *se
 
   home = compat_get_home_path(); if( !home ) return 1;
 
-  snprintf( path, 256, "%s/%s", home, CONFIG_FILE_NAME );
+  snprintf( path, 256, "./%s", CONFIG_FILE_NAME );
 
   /* Create the XML document */
   doc = xmlNewDoc( (const xmlChar*)"1.0" );
diff -rupN fuse-0.9.0/ui/fb/fbmouse.c fuse-0.9.0-pandora/ui/fb/fbmouse.c
--- fuse-0.9.0/ui/fb/fbmouse.c	2007-12-21 17:43:51.000000000 +0100
+++ fuse-0.9.0-pandora/ui/fb/fbmouse.c	2008-11-03 13:38:20.460229000 +0100
@@ -36,7 +36,6 @@
 #include <sys/ioctl.h>
 
 #include "fuse.h"
-#include "fbmouse.h"
 #include "ui/ui.h"
 
 #include <dlfcn.h>
diff -rupN fuse-0.9.0/ui/fb/fbui.c fuse-0.9.0-pandora/ui/fb/fbui.c
--- fuse-0.9.0/ui/fb/fbui.c	2007-12-21 17:43:51.000000000 +0100
+++ fuse-0.9.0-pandora/ui/fb/fbui.c	2008-11-03 13:38:25.567930000 +0100
@@ -32,7 +32,6 @@
 
 #include "fbdisplay.h"
 #include "fbkeyboard.h"
-#include "fbmouse.h"
 #include "ui/ui.h"
 #include "ui/uidisplay.h"
 
diff -rupN fuse-0.9.0/utils.c fuse-0.9.0-pandora/utils.c
--- fuse-0.9.0/utils.c	2008-01-02 19:08:18.000000000 +0100
+++ fuse-0.9.0-pandora/utils.c	2008-11-03 13:39:17.315951700 +0100
@@ -297,9 +297,9 @@ get_next_path( path_context *ctx )
     case UTILS_AUXILIARY_ROM: strncpy( ctx->path, "PROGDIR:roms/", PATH_MAX); return 1;
     case UTILS_AUXILIARY_WIDGET: strncpy( ctx->path, "PROGDIR:widget/", PATH_MAX); return 1;
 #else
-    case UTILS_AUXILIARY_LIB: path_segment = "lib"; break;
-    case UTILS_AUXILIARY_ROM: path_segment = "roms"; break;
-    case UTILS_AUXILIARY_WIDGET: path_segment = "widget"; break;
+    case UTILS_AUXILIARY_LIB: path_segment = "share"; break;
+    case UTILS_AUXILIARY_ROM: path_segment = "share"; break;
+    case UTILS_AUXILIARY_WIDGET: path_segment = "share"; break;
 #endif
     default:
       ui_error( UI_ERROR_ERROR, "unknown auxiliary file type %d", ctx->type );
@@ -321,9 +321,9 @@ get_next_path( path_context *ctx )
   case 2:
 
 #ifndef ROMSDIR
-    path2 = FUSEDATADIR;
+    path2 = "./share";
 #else				/* #ifndef ROMSDIR */
-    path2 = ctx->type == UTILS_AUXILIARY_ROM ? ROMSDIR : FUSEDATADIR;
+    path2 = ctx->type == UTILS_AUXILIARY_ROM ? ROMSDIR : "./share";
 #endif				/* #ifndef ROMSDIR */
     strncpy( ctx->path, path2, PATH_MAX ); buffer[ PATH_MAX - 1 ] = '\0';
     return 1;