diff --git a/ChangeLog b/ChangeLog
index 539fd81ba..919c9750b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-21  Pavel Roskin  <proski@gnu.org>
+
+	* configure.in: Check posix_openpt() first and fallback to
+	GNU-specific getpt() only if needed.
+
 2003-06-29  David Sterba  <dave@jikos.cz>
 
 	* lib/mc.hint.cs: Typo fixes.
diff --git a/configure.in b/configure.in
index a2f7b6f8e..7ebf3115e 100644
--- a/configure.in
+++ b/configure.in
@@ -186,7 +186,7 @@ AC_CHECK_FUNCS([strerror statfs strftime getsid \
 dnl
 dnl getpt is a GNU Extension (glibc 2.1.x)
 dnl
-AC_CHECK_FUNCS(getpt)
+AC_CHECK_FUNCS(posix_openpt, , [AC_CHECK_FUNCS(getpt)])
 AC_CHECK_FUNCS(grantpt, , [AC_CHECK_LIB(pt, grantpt)])
 
 dnl replacing lstat with statlstat on sco makes it more portable between