diff --git a/configure.ac b/configure.ac
index d2d27c90..4113bc78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
 #   configure.ac: Autoconf input file
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2005-2016
+#      Markus Armbruster, 2005-2020
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -167,7 +167,7 @@ main(int argc, char *argv[])
 
 ### Checks for library functions
 
-AC_CHECK_FUNCS(getaddrinfo getpass)
+AC_CHECK_FUNCS(getaddrinfo)
 MY_FUNC_MAKECONTEXT
 
 
diff --git a/src/client/configure.ac b/src/client/configure.ac
index d701a229..00aac39e 100644
--- a/src/client/configure.ac
+++ b/src/client/configure.ac
@@ -27,7 +27,7 @@
 #   configure.ac: Autoconf input file
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2005-2016
+#      Markus Armbruster, 2005-2020
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -76,7 +76,7 @@ fi
 
 ### Checks for library functions.
 
-AC_CHECK_FUNCS(getaddrinfo getpass)
+AC_CHECK_FUNCS(getaddrinfo)
 
 
 ### Site configuration
diff --git a/src/client/getpass.c b/src/client/getpass.c
index b04ec7e5..297b8417 100644
--- a/src/client/getpass.c
+++ b/src/client/getpass.c
@@ -32,19 +32,14 @@
 
 #include <config.h>
 
-#ifdef HAVE_GETPASS
-#include <unistd.h>
-#else
 #include <string.h>
 #ifdef _WIN32
 #include <windows.h>
 #else
 #include <termios.h>
 #endif
-#endif
 #include "misc.h"
 
-#ifndef HAVE_GETPASS
 static int
 set_echo_if_tty(int on)
 {
@@ -79,14 +74,10 @@ set_echo_if_tty(int on)
     return 1;
 #endif
 }
-#endif	/* !HAVE_GETPASS */
 
 char *
 get_password(const char *prompt)
 {
-#ifdef HAVE_GETPASS
-    return getpass(prompt);
-#else
     static char buf[128];
     char *p;
     size_t len;
@@ -109,5 +100,4 @@ get_password(const char *prompt)
     if (p[len - 1] == '\n')
 	p[len - 1] = 0;
     return p;
-#endif	/* !HAVE_GETPASS */
 }