--- a/Makefile	Sat Aug 12 10:41:52 2017 +0200
+++ b/Makefile	Thu Aug 24 13:10:56 2017 +0200
@@ -82,7 +82,6 @@
   HAVE_ERR_H ?=		1
   HAVE_GETRANDOM ?=	0
   HAVE_SYS_QUEUE_H ?=	0
-  HAVE_READPASSPHRASE_H ?= 0
   HAVE_SETPROGNAME ?=	0
   HAVE_SYS_TREE_H ?=	0
 else ifneq ($(findstring $(OS_NAME),FreeBSD DragonFly),)
@@ -91,7 +90,6 @@
   HAVE_ERR_H ?=		1
   HAVE_GETRANDOM ?=	0
   HAVE_SYS_QUEUE_H ?=	1
-  HAVE_READPASSPHRASE_H ?= 1
   HAVE_SETPROGNAME ?=	1
   HAVE_SYS_TREE_H ?=	1
 else ifeq ($(OS_NAME),NetBSD)
@@ -100,7 +98,6 @@
   HAVE_ERR_H ?=		1
   HAVE_GETRANDOM ?=	0
   HAVE_SYS_QUEUE_H ?=	1
-  HAVE_READPASSPHRASE_H ?= 0
   HAVE_SYS_TREE_H ?=	1
   HAVE_SETPROGNAME ?=	1
 else ifeq ($(OS_NAME),OpenBSD)
@@ -109,7 +106,6 @@
   HAVE_ERR_H ?=		1
   HAVE_GETRANDOM ?=	0
   HAVE_SYS_QUEUE_H ?=	1
-  HAVE_READPASSPHRASE_H ?= 1
   HAVE_SYS_TREE_H ?=	1
   HAVE_SETPROGNAME ?=	1
 else ifeq ($(OS_NAME),SunOS)
@@ -125,7 +121,6 @@
     HAVE_GETRANDOM ?=	1
   endif
   HAVE_SYS_QUEUE_H ?=	0
-  HAVE_READPASSPHRASE_H ?= 0
   HAVE_SYS_TREE_H ?=	0
   HAVE_SETPROGNAME ?=	0
 else
@@ -134,7 +129,6 @@
   HAVE_ERR_H ?=		0
   HAVE_GETRANDOM ?=	0
   HAVE_SYS_QUEUE_H ?=	0
-  HAVE_READPASSPHRASE_H ?= 0
   HAVE_SETPROGNAME ?=	0
   HAVE_SYS_TREE_H ?=	0
 endif
@@ -157,7 +151,7 @@
 
 XCPPFLAGS =	-DPACKAGE=\"$(PACKAGE)\" \
 		-DVERSION=\"$(VERSION)\"
-LDLIBS =	-lpws -lnettle
+LDLIBS =	-ltecla -lcurses -lpws -lnettle
 ifeq ($(HAVE_ASPRINTF),1)
   XCPPFLAGS +=	-DHAVE_ASPRINTF
 else
@@ -177,11 +171,6 @@
 else
   OBJS +=	compat/err.o
 endif
-ifeq ($(HAVE_READPASSPHRASE_H),1)
-  XCPPFLAGS +=	-DHAVE_READPASSPHRASE_H
-else
-  OBJS +=	compat/readpassphrase.o
-endif
 ifeq ($(HAVE_SETPROGNAME),1)
   XCPPFLAGS +=	-DHAVE_SETPROGNAME
 else