diff --git a/minix/servers/vfs/device.c b/minix/servers/vfs/device.c
index 454f66554..54a1b0872 100644
--- a/minix/servers/vfs/device.c
+++ b/minix/servers/vfs/device.c
@@ -288,8 +288,9 @@ int cdev_io(
   /* Handle TIOCSCTTY ioctl: set controlling tty.
    * TODO: cleaner implementation work in progress.
    */
-  if (op == CDEV_IOCTL && bytes == TIOCSCTTY && major(dev) == TTY_MAJOR) {
-       fp->fp_tty = dev;
+  if (op == CDEV_IOCTL && bytes == TIOCSCTTY &&
+     (major(dev) == TTY_MAJOR || major(dev) == PTY_MAJOR)) {
+	fp->fp_tty = dev;
   }
 
   /* Create a grant for the buffer provided by the user process. */