diff --git a/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild b/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild
index 2e019322b8482..507b0eabece4e 100644
--- a/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild
+++ b/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild
@@ -21,22 +21,17 @@ PATCHES=(
 	"${FILESDIR}"/${P}-as-needed.patch
 	"${FILESDIR}"/${P}-tinfo.patch
 )
+DOCS=(
+	Changelog NEWS README TODO contrib/etpan-make-vtree.pl doc/CONFIG
+	doc/INTERNAL
+)
 
 src_prepare() {
 	default
+	sed -i -e "s:@bindir@:${D}/@bindir@:" src/Makefile.in || die
 	eautoreconf
 }
 
-src_compile() {
-	sed -i -e "s:@bindir@:${D}/@bindir@:" src/Makefile.in
-
-	econf \
-		`use_enable debug` \
-			|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc Changelog NEWS README TODO contrib/etpan-make-vtree.pl doc/*
+src_configure() {
+	econf --disable-debug
 }