diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index 1644aee39bb0..4443f0889c46 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -63,9 +63,9 @@ openpty(amaster, aslave, name, termp, winp)
 	else
 		ttygid = -1;
 
-	for (cp1 = "pqrs"; *cp1; cp1++) {
+	for (cp1 = "pqrsPQRS"; *cp1; cp1++) {
 		line[8] = *cp1;
-		for (cp2 = "0123456789abcdef"; *cp2; cp2++) {
+		for (cp2 = "0123456789abcdefghijklmnopqrstuv"; *cp2; cp2++) {
 			line[9] = *cp2;
 			if ((master = open(line, O_RDWR, 0)) == -1) {
 				if (errno == ENOENT)
diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c
index abb732bedca5..17b96065c900 100644
--- a/libexec/telnetd/sys_term.c
+++ b/libexec/telnetd/sys_term.c
@@ -507,7 +507,7 @@ int *ptynum;
 	p2 = &line[14];
 #endif
 
-	for (cp = "pqrstuvwxyzPQRST"; *cp; cp++) {
+	for (cp = "pqrsPQRS"; *cp; cp++) {
 		struct stat stb;
 
 		*p1 = *cp;
@@ -519,8 +519,8 @@ int *ptynum;
 		 */
 		if (stat(line, &stb) < 0)
 			break;
-		for (i = 0; i < 16; i++) {
-			*p2 = "0123456789abcdef"[i];
+		for (i = 0; i < 32; i++) {
+			*p2 = "0123456789abcdefghijklmnopqrstuv"[i];
 			p = open(line, 2);
 			if (p > 0) {
 #ifndef	__hpux