diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index f912a9e47..7762557d6 100644
--- a/winsup/cygwin/dir.cc
+++ b/winsup/cygwin/dir.cc
@@ -410,8 +410,6 @@ rmdir (const char *dir)
 	set_errno (ENOENT);
       else if (has_dot_last_component (dir, false))
 	set_errno (EINVAL);
-      else if (isdev_dev (fh->dev ()))
-	set_errno (ENOTEMPTY);
       else if (!fh->rmdir ())
 	res = 0;
       delete fh;
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index e1829e28f..af1ef3a45 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -1765,6 +1765,7 @@ public:
   int close ();
   int __reg2 fstat (struct stat *buf);
   int __reg2 fstatvfs (struct statvfs *buf);
+  int rmdir ();
   DIR __reg2 *opendir (int fd);
   int __reg3 readdir (DIR *, dirent *);
   void rewinddir (DIR *);
diff --git a/winsup/cygwin/fhandler_dev.cc b/winsup/cygwin/fhandler_dev.cc
index 28b0e3cf0..5fd75a58e 100644
--- a/winsup/cygwin/fhandler_dev.cc
+++ b/winsup/cygwin/fhandler_dev.cc
@@ -107,6 +107,13 @@ fhandler_dev::fstatvfs (struct statvfs *sfs)
   return ret;
 }
 
+int
+fhandler_dev::rmdir ()
+{
+  set_errno (ENOTEMPTY);
+  return -1;
+}
+
 DIR *
 fhandler_dev::opendir (int fd)
 {