diff --git a/makefile b/makefile
index 79e4d8e..4ba9939 100644
--- a/makefile
+++ b/makefile
@@ -22,6 +22,6 @@ clean:
 	$(MAKE) -C src clean
 
 install:
-	cp data/evisum.png $(PREFIX)/share/icons
-	cp data/evisum.desktop $(PREFIX)/share/applications
-	cp evisum $(PREFIX)/bin
+	install -m 0644 data/evisum.png $(PREFIX)/share/icons
+	install -m 0644 data/evisum.desktop $(PREFIX)/share/applications
+	install -m 0755 evisum $(PREFIX)/bin
diff --git a/src/disks.c b/src/disks.c
index 6d2200d..2f8f943 100644
--- a/src/disks.c
+++ b/src/disks.c
@@ -232,14 +232,20 @@ disks_get(void)
    char *name;
    Eina_List *devs, *list;
    char buf[4096];
+   const char *disk_search = "/dev/disk/by-uuid";
+
+   devs = ecore_file_ls(disk_search);
+   if (!devs)
+     {
+        disk_search = "/dev/disk/by-path";
+        devs = ecore_file_ls(disk_search);
+     }
 
    list = NULL;
 
-   devs = ecore_file_ls("/dev/disk/by-path");
-
    EINA_LIST_FREE(devs, name)
      {
-        snprintf(buf, sizeof(buf), "/dev/disk/by-path/%s", name);
+        snprintf(buf, sizeof(buf), "%s/%s", disk_search, name);
         char *real = realpath(buf, NULL);
         if (real)
           {