diff --git a/configure.ac b/configure.ac
index 406d27f35..ccc01a9d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1268,7 +1268,6 @@ AC_CHECK_FUNCS( strtoll \
                 siginterrupt \
                 sigaction \
                 signal \
-                getpass \
                 getpass_r \
                 strlcat \
                 getpwuid \
diff --git a/src/getpass.c b/src/getpass.c
index 6ef8d3061..2d60e7f25 100644
--- a/src/getpass.c
+++ b/src/getpass.c
@@ -38,18 +38,6 @@
 
 #include "getpass.h"
 
-#ifdef HAVE_GETPASS
-char *getpass_r(const char *prompt, char *password, size_t passlen)
-{
-  char *ptr = getpass(prompt);
-  strncpy(password, ptr, passlen);
-  password[passlen-1]=0;
-  return password;
-}
-#define DONE
-#else
-/* the rest of this file is only for systems without getpass() */
-
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -224,7 +212,5 @@ char *getpass_r(const char *prompt, /* prompt to display */
   return password; /* return pointer to buffer */
 }
 
-#endif /* DONE */
-
 #endif /* HAVE_GETPASS */
 #endif /* HAVE_GETPASS_R */