--- src/sys/compat/linux/linux_stats.c
+++ src/sys/compat/linux/linux_stats.c
@@ -52,6 +52,7 @@
 	struct cdevsw *cdevsw;
 	dev_t dev;
 
+	bzero(&tbuf, sizeof(tbuf));
 	tbuf.st_dev = uminor(buf->st_dev) | (umajor(buf->st_dev) << 8);
 	tbuf.st_ino = buf->st_ino;
 	tbuf.st_mode = buf->st_mode;
@@ -360,6 +361,8 @@
 stat64_copyout(struct stat *buf, void *ubuf)
 {
 	struct l_stat64 lbuf;
+	struct cdevsw *cdevsw;
+	dev_t dev;
 
 	bzero(&lbuf, sizeof(lbuf));
 	lbuf.st_dev = uminor(buf->st_dev) | (umajor(buf->st_dev) << 8);
@@ -375,6 +378,23 @@
 	lbuf.st_ctime = buf->st_ctime;
 	lbuf.st_blksize = buf->st_blksize;
 	lbuf.st_blocks = buf->st_blocks;
+
+	/* Lie about disk drives which are character devices
+	 * in FreeBSD but block devices under Linux.
+	 */
+	if (S_ISCHR(lbuf.st_mode) &&
+	    (dev = udev2dev(buf->st_rdev, 0)) != NODEV) {
+		cdevsw = devsw(dev);
+		if (cdevsw != NULL && (cdevsw->d_flags & D_DISK)) {
+			lbuf.st_mode &= ~S_IFMT;
+			lbuf.st_mode |= S_IFBLK;
+
+			/* XXX this may not be quite right */
+			/* Map major number to 0 */
+			lbuf.st_dev = uminor(buf->st_dev) & 0xf;
+			lbuf.st_rdev = buf->st_rdev & 0xff;
+		}
+	}
 
 	/*
 	 * The __st_ino field makes all the difference. In the Linux kernel