diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index a285e7cdcb0..b8c1407fabf 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,27 +1,28 @@
-# $OpenBSD: Makefile,v 1.3 2000/01/05 09:06:12 pjanzen Exp $
-#
+# $OpenBSD: Makefile,v 1.4 2000/01/23 07:06:15 brad Exp $
 
-DISTNAME=       elm-2.4ME+66
+DISTNAME=	elm-2.4ME+66
 CATEGORIES=	mail
-MASTER_SITES=   ftp://ftp.ozone.fmi.fi/KEH/
+MASTER_SITES=	ftp://ftp.ozone.fmi.fi/KEH/
 
-MAINTAINER=	pjanzen@OpenBSD.ORG
+MAINTAINER=	pjanzen@openbsd.org
 
-WRKSRC=         ${WRKDIR}/elm2.4.ME+.66
-
-HAS_CONFIGURE=  Yes
+HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT= Configure
-CONFIGURE_ENV+= PREFIX="${PREFIX}"
 CONFIGURE_ARGS+= -S -d
-SCRIPTS_ENV= OPSYS=${OPSYS}
+CONFIGURE_ENV+=	PREFIX="${PREFIX}"
+SCRIPTS_ENV=	OPSYS="${OPSYS}"
 
-post-configure:
-	${CP} ${FILESDIR}/elm.mimecharsets ${WRKSRC}/bin
+WRKSRC=	${WRKDIR}/elm2.4.ME+.66
+
+pre-configure:
+	@cp ${FILESDIR}/config.sh ${WRKSRC}
+	@cp ${FILESDIR}/elm.mimecharsets ${WRKSRC}/bin
+	@sed -e s,/usr/local,${PREFIX}, ${WRKSRC}/nls/LANGS > ${WRKSRC}/nls/LANGS.new
+	@mv ${WRKSRC}/nls/LANGS.new ${WRKSRC}/nls/LANGS
 
 post-install:
-	perl -pi -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
-	cd ${WRKSRC}/nls; ${MAKE} install
-	if [ -f ${PREFIX}/lib/elm.mimetypes ] ; then \
+	@cd ${WRKSRC}/nls; make install
+	if [ -f ${PREFIX}/lib/elm.mimetypes ]; then \
 		${INSTALL_DATA} \
 			${FILESDIR}/elm.mimetypes ${PREFIX}/lib/elm.mimetypes-dist; \
 	else \
diff --git a/mail/elm/scripts/pre-configure b/mail/elm/files/config.sh
similarity index 94%
rename from mail/elm/scripts/pre-configure
rename to mail/elm/files/config.sh
index 8f6f3f39257..1e0c237a28b 100644
--- a/mail/elm/scripts/pre-configure
+++ b/mail/elm/files/config.sh
@@ -1,14 +1,3 @@
-#!/bin/sh -
-#
-#	#OpenBSD$
-#	pre-configure script for Elm port to FreeBSD 2.0
-# $FreeBSD: ports/mail/elm/scripts/pre-configure,v 1.20 1999/09/08 18:10:47 ache Exp $
-
-PortsDir=$PORTSDIR
-  CurDir=$CURDIR
-  WrkSrc=$WRKSRC
-
-	cat > ${WrkSrc}/config.sh << 'EOF'
 #!/bin/sh
 # config.sh
 # This file was produced by running the Configure script.
@@ -307,7 +296,3 @@ pgp5_dir="${PREFIX}/bin"
 gpg_path="${PREFIX}/bin/gpg"
 special_path='/usr/bin'
 CONFIG=true
-EOF
-
-exit 0
-# END