diff --git a/mail/Makefile b/mail/Makefile
index 98b8f7579f90..9c2fa3409f50 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -105,6 +105,7 @@
     SUBDIR += dsbl-testers
     SUBDIR += dspam
     SUBDIR += ecartis
+    SUBDIR += elm
     SUBDIR += elmo
     SUBDIR += elmo-devel
     SUBDIR += emil
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index ba6965d42346..3ffab61432c2 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
 CFLAGS+=	-D_SIZE_T
 
 WRKSRC=			${WRKDIR}/elm${PORTVERSION}
-NO_LATEST_LINK=		yes
 USES=		gettext
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
diff --git a/mail/elm/pkg-plist b/mail/elm/pkg-plist
index 914628d5c8ad..c18c0b098d1b 100644
--- a/mail/elm/pkg-plist
+++ b/mail/elm/pkg-plist
@@ -4,18 +4,16 @@ bin/checkalias
 bin/elmalias
 bin/fastmail
 bin/frm
-@exec ln -f %D/%F %D/bin/nfrm
-@unexec rm -f %D/bin/nfrm
 bin/listalias
 bin/messages
 bin/newalias
 bin/newmail
-@exec ln -f %D/%F %D/bin/wnewmail
-@unexec rm -f %D/bin/wnewmail
+bin/nfrm
 bin/printmail
 bin/readmsg
 bin/prlong
 bin/mmencode
+bin/wnewmail
 lib/elmrc-info
 lib/help-main
 lib/help-options