diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 09278d89f..0db0b2201 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -367,6 +367,7 @@ enlightenment_start_LDFLAGS = @dlopen_libs@
 enlightenment_thumb_SOURCES = \
 e.h \
 e_thumb_main.c \
+e_user.c \
 e_sha1.c
 
 enlightenment_thumb_LDFLAGS = @e_libs@ @dlopen_libs@
diff --git a/src/bin/e_thumb_main.c b/src/bin/e_thumb_main.c
index 52aabf6f4..905847d4e 100644
--- a/src/bin/e_thumb_main.c
+++ b/src/bin/e_thumb_main.c
@@ -46,7 +46,6 @@ main(int argc, char **argv)
 {
 //   char buf[4096];
    int i;
-   char *home;
 
 /* FIXME: make this configurable */
 //   nice(20);
@@ -82,9 +81,8 @@ main(int argc, char **argv)
    ecore_desktop_paths_regen();
 */
   
-   home = getenv("HOME");
-   if (!home) home = "/tmp";
-   snprintf(_thumbdir, sizeof(_thumbdir), "%s/.e/e/fileman/thumbnails", home);
+   snprintf(_thumbdir, sizeof(_thumbdir), "%s/.e/e/fileman/thumbnails", 
+	    e_user_homedir_get());
    ecore_file_mkpath(_thumbdir);
    
    if (_e_ipc_init()) ecore_main_loop_begin();