diff --git a/data/other/Makefile.am b/data/other/Makefile.am
index 02503e4eb..7faa65fe9 100644
--- a/data/other/Makefile.am
+++ b/data/other/Makefile.am
@@ -1,5 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 filesdir = $(datadir)/enlightenment/data/other
-files_DATA = favorite_apps.tar.gz
+files_DATA = applications.tar.gz
 
 EXTRA_DIST = $(files_DATA)
diff --git a/data/other/applications.tar.gz b/data/other/applications.tar.gz
new file mode 100644
index 000000000..c03623830
Binary files /dev/null and b/data/other/applications.tar.gz differ
diff --git a/data/other/favorite_apps.tar.gz b/data/other/favorite_apps.tar.gz
deleted file mode 100644
index a7bfb7f36..000000000
Binary files a/data/other/favorite_apps.tar.gz and /dev/null differ
diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c
index abeec5330..f72f8f5b3 100644
--- a/src/bin/e_apps.c
+++ b/src/bin/e_apps.c
@@ -79,7 +79,7 @@ E_App *
 e_app_new(char *path, int scan_subdirs)
 {
    E_App *a;
-   
+
    a = evas_hash_find(_e_apps, path);
    if (a)
      {
@@ -479,17 +479,24 @@ _e_app_dir_file_list_get(E_App *a, char *path)
 	       {
 		  int ok = 0;
 		  
-		  if (buf[len - 1] == '\n') buf[len - 1] = 0;
-		  for (l = files; l; l = l->next)
+		  if (buf[len - 1] == '\n')
 		    {
-		       if (!strcmp(buf, l->data))
-			 {
-			    free(l->data);
-			    files = evas_list_remove_list(files, l);
-			    break;
-			 }
+		       buf[len - 1] = 0;
+		       len--;
+		    }
+		  if (len > 0)
+		    {
+		       for (l = files; l; l = l->next)
+			 {
+			    if (!strcmp(buf, l->data))
+			      {
+				 free(l->data);
+				 files = evas_list_remove_list(files, l);
+				 break;
+			      }
+			 }
+		       files2 = evas_list_append(files2, strdup(buf));
 		    }
-		  files2 = evas_list_append(files2, strdup(buf));
 	       }
 	  }
 	fclose(f);
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 051ea38ea..3eac9bddc 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -386,16 +386,17 @@ _e_main_dirs_init(void)
 	     return 0;
 	  }
      }
+   
    /* FIXME: THIS is a hack to get people started!!! */
-/*   
-   snprintf(buf, sizeof(buf), "%s/.e/e/applications/favorite/eterm.eet", homedir);
+   snprintf(buf, sizeof(buf), "%s/.e/e/applications/all/eterm.eet", homedir);
    if (!e_file_exists(buf))
-     snprintf(buf, sizeof(buf), "tar -C %s/.e/e/applications/favorite/ zxvf %s/data/other/favorite_apps.tar.gz", homedir, PACKAGE_DATA_DIR);
-   snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/", homedir);
-   if (!e_file_exists(buf))
-     snprintf(buf, sizeof(buf), "tar -C %s/.e/e/applications/bar/ zxvf %s/data/other/favorite_apps.tar.gz", homedir, PACKAGE_DATA_DIR);
+     snprintf(buf, sizeof(buf), 
+	      "gzip -d -c < %s/data/other/applications.tar.gz |"
+	      "(cd %s/.e/e/ ; tar -xf -)", 
+	      PACKAGE_DATA_DIR,
+	      homedir);
    free(homedir);
- */
+   
    return 1;
 }