diff --git a/editors/cle/Makefile b/editors/cle/Makefile
index fce07c6deb05..199ba77482f0 100644
--- a/editors/cle/Makefile
+++ b/editors/cle/Makefile
@@ -1,26 +1,24 @@
 # New ports collection makefile for:   cle
 # Date created:		25 July 2006
 # Whom:			Timothy Bourke <timbob@bigpond.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cle
 PORTVERSION=	0.4
 CATEGORIES=	editors
 MASTER_SITES=	ftp://kaolin.unice.fr/pub/Cle/
 
 MAINTAINER=	timbob@bigpond.com
 COMMENT=	Command Line Editor (based on readline)
 
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	aclocal:110 autoconf:262 automake:110
 USE_GMAKE=	yes
+AUTOMAKE_ARGS=	--gnu --add-missing
 
 PLIST_FILES=	bin/cle
 
 MAN1=		cle.1
 
-post-extract:
-	${CHMOD} ug+x ${WRKSRC}/missing
-
 .include <bsd.port.mk>
diff --git a/editors/cle/files/patch-configure b/editors/cle/files/patch-configure
deleted file mode 100644
index af87e3a57b1d..000000000000
--- a/editors/cle/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri Nov 19 01:24:25 1999
-+++ configure	Wed Jul 26 17:02:11 2006
-@@ -1328,7 +1328,7 @@
- 
- 
- 
--(cd readline; configure $prefix $curses) 
-+(cd readline; ./configure --prefix="$prefix" $curses) 
- 
- 
- 
diff --git a/editors/cle/files/patch-configure.in b/editors/cle/files/patch-configure.in
new file mode 100644
index 000000000000..b1e8b0932b09
--- /dev/null
+++ b/editors/cle/files/patch-configure.in
@@ -0,0 +1,14 @@
+--- configure.in.org	2010-04-02 19:42:34.000000000 +0900
++++ configure.in	2010-04-02 19:42:58.000000000 +0900
+@@ -48,8 +48,8 @@
+ 
+ dnl Recursive configuration 
+ 
+-(cd readline; configure $prefix $curses) 
++(cd readline; ./configure --prefix=$prefix $curses) 
+ 
+-AC_SUBST(TERMLIB, TERMLIB)
+-AC_SUBST(VERSION, VERSION)
++AC_SUBST(TERMLIB)
++AC_SUBST(VERSION)
+ AC_OUTPUT(Makefile src/Makefile doc/Makefile etc/cle.spec)