diff --git a/legacy/eeze/ChangeLog b/legacy/eeze/ChangeLog
index 029dbef1e4..d6189bfea4 100644
--- a/legacy/eeze/ChangeLog
+++ b/legacy/eeze/ChangeLog
@@ -110,3 +110,7 @@
 
         * Add yet another libmount backend for eeze_disk to handle current
           setups which do not have mtab and instead use /proc/self/mountinfo
+
+2012-07-30 Mike Blumenkrantz
+
+        * Add EEZE_DISK_MOUNTOPT_NODEV option for disabling device nodes on mount
diff --git a/legacy/eeze/src/lib/Eeze_Disk.h b/legacy/eeze/src/lib/Eeze_Disk.h
index 8c402ad305..36079b34de 100644
--- a/legacy/eeze/src/lib/Eeze_Disk.h
+++ b/legacy/eeze/src/lib/Eeze_Disk.h
@@ -63,7 +63,8 @@ typedef enum
    EEZE_DISK_MOUNTOPT_NOEXEC = (1 << 3),
    EEZE_DISK_MOUNTOPT_NOSUID = (1 << 4),
    EEZE_DISK_MOUNTOPT_REMOUNT = (1 << 5),
-   EEZE_DISK_MOUNTOPT_UID = (1 << 6) /**< use current user's uid */
+   EEZE_DISK_MOUNTOPT_UID = (1 << 6), /**< use current user's uid */
+   EEZE_DISK_MOUNTOPT_NODEV = (1 << 7) /**< @since 1.7 */
 } Eeze_Mount_Opts;
 
 
diff --git a/legacy/eeze/src/lib/eeze_disk_libmount.c b/legacy/eeze/src/lib/eeze_disk_libmount.c
index d1c38e8bee..885f313cc0 100644
--- a/legacy/eeze/src/lib/eeze_disk_libmount.c
+++ b/legacy/eeze/src/lib/eeze_disk_libmount.c
@@ -29,6 +29,7 @@ static struct libmnt_optmap eeze_optmap[] =
    { "nosuid", EEZE_DISK_MOUNTOPT_NOSUID, 0 },
    { "remount", EEZE_DISK_MOUNTOPT_REMOUNT, 0 },
    { "uid[=]", EEZE_DISK_MOUNTOPT_UID, 0 },
+   { "nodev", EEZE_DISK_MOUNTOPT_NODEV, 0 },
    { NULL, 0, 0 }
 };
 typedef struct libmnt_table libmnt_table;
diff --git a/legacy/eeze/src/lib/eeze_disk_libmount_new.c b/legacy/eeze/src/lib/eeze_disk_libmount_new.c
index 1c77b03d40..95dc74a448 100644
--- a/legacy/eeze/src/lib/eeze_disk_libmount_new.c
+++ b/legacy/eeze/src/lib/eeze_disk_libmount_new.c
@@ -32,6 +32,7 @@ static struct libmnt_optmap eeze_optmap[] =
    { "nosuid", EEZE_DISK_MOUNTOPT_NOSUID, 0 },
    { "remount", EEZE_DISK_MOUNTOPT_REMOUNT, 0 },
    { "uid[=]", EEZE_DISK_MOUNTOPT_UID, 0 },
+   { "nodev", EEZE_DISK_MOUNTOPT_NODEV, 0 },
    { NULL, 0, 0 }
 };
 typedef struct libmnt_table libmnt_table;
diff --git a/legacy/eeze/src/lib/eeze_disk_mount.c b/legacy/eeze/src/lib/eeze_disk_mount.c
index f4bfc13e6b..41bd8c6b35 100644
--- a/legacy/eeze/src/lib/eeze_disk_mount.c
+++ b/legacy/eeze/src/lib/eeze_disk_mount.c
@@ -348,6 +348,8 @@ eeze_disk_mount(Eeze_Disk *disk)
                }
              if (disk->mount_opts & EEZE_DISK_MOUNTOPT_NOEXEC)
                eina_strbuf_append(disk->mount_cmd, "noexec,");
+             if (disk->mount_opts & EEZE_DISK_MOUNTOPT_NODEV)
+               eina_strbuf_append(disk->mount_cmd, "nodev,");
              if (disk->mount_opts & EEZE_DISK_MOUNTOPT_NOSUID)
                eina_strbuf_append(disk->mount_cmd, "nosuid,");
              if (disk->mount_opts & EEZE_DISK_MOUNTOPT_REMOUNT)