diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index b04d24a40a1..e311d6d33d2 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2010/10/24 12:17:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2011/07/03 20:30:42 naddy Exp $
 
 COMMENT=	once-popular mail user agent
 
 DISTNAME=	elm-2.4ME+66
+REVISION=	0
 CATEGORIES=	mail
 
 MASTER_SITES=	ftp://ftp.ozone.fmi.fi/KEH/
@@ -41,7 +42,7 @@ post-install:
 	@cd ${WRKSRC}/nls; make install
 	${INSTALL_DATA} \
 		${FILESDIR}/elm.mimetypes ${PREFIX}/lib/elm.mimetypes-dist
-	ln -f ${PREFIX}/man/cat1/newmail.0 ${PREFIX}/man/cat1/wnewmail.0
+	ln -f ${PREFIX}/man/man1/newmail.1 ${PREFIX}/man/man1/wnewmail.1
 	ln -f ${PREFIX}/bin/frm ${PREFIX}/bin/nfrm
 	ln -f ${PREFIX}/bin/newmail ${PREFIX}/bin/wnewmail
 
diff --git a/mail/elm/files/config.sh b/mail/elm/files/config.sh
index a90d9aef58a..9f16d65a464 100644
--- a/mail/elm/files/config.sh
+++ b/mail/elm/files/config.sh
@@ -252,9 +252,9 @@ linepr='/usr/bin/lpr'
 maildir='/var/mail'
 mailer='/usr/sbin/sendmail'
 mailgrp='wheel'
-mansrc='none'
-catmansrc="${PREFIX}/man/cat1"
-manext=''
+mansrc="${PREFIX}/man/man1"
+catmansrc='none'
+manext='.1'
 manext_choice=''
 catmanext='.0'
 catmanext_choice='.0'
diff --git a/mail/elm/pkg/PLIST b/mail/elm/pkg/PLIST
index d87225f636d..ef37f1d09b5 100644
--- a/mail/elm/pkg/PLIST
+++ b/mail/elm/pkg/PLIST
@@ -1,18 +1,18 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/09/15 09:09:41 espie Exp $
-bin/answer
+@comment $OpenBSD: PLIST,v 1.6 2011/07/03 20:30:42 naddy Exp $
+@bin bin/answer
 bin/checkalias
-bin/elm
-bin/elmalias
-bin/fastmail
-bin/frm
+@bin bin/elm
+@bin bin/elmalias
+@bin bin/fastmail
+@bin bin/frm
 bin/listalias
 bin/messages
-bin/newalias
-bin/newmail
-bin/nfrm
+@bin bin/newalias
+@bin bin/newmail
+@bin bin/nfrm
 bin/printmail
-bin/readmsg
-bin/wnewmail
+@bin bin/readmsg
+@bin bin/wnewmail
 lib/elm-help.0
 lib/elm-help.1
 lib/elm-help.2
@@ -20,21 +20,21 @@ lib/elm-help.3
 lib/elm.mimecharsets
 lib/elm.mimetypes-dist
 @sample lib/elm.mimetypes
-lib/elmcharset
+@bin lib/elmcharset
 lib/elmrc-info
-lib/prlong
-@man man/cat1/answer.0
-@man man/cat1/checkalias.0
-@man man/cat1/elm.0
-@man man/cat1/elmalias.0
-@man man/cat1/elmcharset.0
-@man man/cat1/fastmail.0
-@man man/cat1/frm.0
-@man man/cat1/listalias.0
-@man man/cat1/messages.0
-@man man/cat1/newalias.0
-@man man/cat1/newmail.0
-@man man/cat1/printmail.0
-@man man/cat1/readmsg.0
-@man man/cat1/wnewmail.0
+@bin lib/prlong
+@man man/man1/answer.1
+@man man/man1/checkalias.1
+@man man/man1/elm.1
+@man man/man1/elmalias.1
+@man man/man1/elmcharset.1
+@man man/man1/fastmail.1
+@man man/man1/frm.1
+@man man/man1/listalias.1
+@man man/man1/messages.1
+@man man/man1/newalias.1
+@man man/man1/newmail.1
+@man man/man1/printmail.1
+@man man/man1/readmsg.1
+@man man/man1/wnewmail.1
 share/nls/C/elm2.4me+.cat