diff --git a/fs/vfs/main.cc b/fs/vfs/main.cc
index 785369f3bda445e8d6782384c81e557299e004d3..2359e9e9ad9c69e41347fb4d0f8165eca973f8f7 100644
--- a/fs/vfs/main.cc
+++ b/fs/vfs/main.cc
@@ -1558,9 +1558,6 @@ extern "C" void mount_zfs_rootfs(void)
 	if (ret)
 		kprintf("failed to pivot root, error = %s\n", strerror(ret));
 
-	if (mkdir("/dev", 0755) < 0)
-		kprintf("failed to create /dev, error = %s\n", strerror(errno));
-
 	ret = sys_mount("", "/dev", "devfs", 0, NULL);
 	if (ret)
 		kprintf("failed to mount devfs, error = %s\n", strerror(ret));
diff --git a/static/dev/.keep b/static/dev/.keep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/usr.manifest.skel b/usr.manifest.skel
index 89ca57059e28e1ac94b4e5e97914dd5537a294a1..a62f9b39be294378474cd3e83d32ada794adad48 100644
--- a/usr.manifest.skel
+++ b/usr.manifest.skel
@@ -154,3 +154,4 @@
 /tools/lsroute.so: ./tools/route/lsroute.so
 /&/etc/hosts: ../../static/&
 /&/etc/inputrc: ../../static/&
+/&/dev/.keep: ../../static/&