diff --git a/ChangeLog b/ChangeLog
index c7140d32f..e51b23754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-16  Tanaka Akira  <akr@zsh.org>
+
+	* 11420: Src/Modules/zpty.c: try more pty device files.
+
 2000-05-16  Bart Schaefer  <schaefer@zsh.org>
 
 	* 11419: Test/Makefile.in: Interpolate TESTNUM variable in the
diff --git a/Src/Modules/zpty.c b/Src/Modules/zpty.c
index 4dccf73ba..a0897b828 100644
--- a/Src/Modules/zpty.c
+++ b/Src/Modules/zpty.c
@@ -213,13 +213,16 @@ static int
 get_pty(int master, int *retfd)
 {
 
-#ifdef __linux
+#if defined(__linux)
     static char char1[] = "abcdefghijklmnopqrstuvwxyz";
     static char char2[] = "0123456789abcdef";
-#else /* ! __linux */
-    static char char1[] = "pq";
+#elif defined(__FreeBSD__)
+    static char char1[] = "pqrsPQRS";
+    static char char2[] = "0123456789abcdefghijklmnopqrstuv";
+#else
+    static char char1[] = "pqrstuvwxyzPQRST";
     static char char2[] = "0123456789abcdef";
-#endif /* __linux */
+#endif
 
     static char name[11];
     static int mfd, sfd;