diff --git a/tty-keys.c b/tty-keys.c
index 7d49229c..f31db0ac 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -686,9 +686,9 @@ tty_keys_device(struct tty *tty, const char *buf, size_t len, size_t *size)
 	char  tmp[64], *endptr;
 
 	/*
-	 * Secondary device attributes are \033[>a;b;c. We only request
-	 * attributes on xterm, so we only care about the middle values which
-	 * is the xterm version.
+	 * Primary device attributes are \033[?a;b and secondary are
+	 * \033[>a;b;c. We only request attributes on xterm, so we only care
+	 * about the middle values which is the xterm version.
 	 */
 
 	*size = 0;
@@ -702,7 +702,7 @@ tty_keys_device(struct tty *tty, const char *buf, size_t len, size_t *size)
 		return (-1);
 	if (len == 2)
 		return (1);
-	if (buf[2] != '>')
+	if (buf[2] != '>' && buf[2] != '?')
 		return (-1);
 	if (len == 3)
 		return (1);
@@ -718,6 +718,10 @@ tty_keys_device(struct tty *tty, const char *buf, size_t len, size_t *size)
 	tmp[i] = '\0';
 	*size = 4 + i;
 
+	/* Only secondary is of interest. */
+	if (buf[2] != '>')
+		return (0);
+
 	/* Convert version numbers. */
 	a = strtoul(tmp, &endptr, 10);
 	if (*endptr == ';') {