diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile
index 71465cfc0f70..a46fc785f4d7 100644
--- a/lang/sml-nj/Makefile
+++ b/lang/sml-nj/Makefile
@@ -32,7 +32,8 @@ USE_GMAKE=	yes
 
 ONLY_FOR_ARCHS=	i386
 
-PKGINSTALL=	${WRKDIR}/.pkg-install
+SUB_FILES=	pkg-install
+SUB_LIST=	EXEBINDIR=${SML_BASERELATIVE}/bin EXENAMES="${SML_EXES}"
 PKGDEINSTALL=	${PKGINSTALL}
 
 SML_BASERELATIVE=	lib/sml-nj
@@ -91,9 +92,6 @@ do-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SML_SRCDIR}
 
 post-install:
-	${SED} -e 's?%%EXENAMES%%?${SML_EXES}?g' \
-	-e 's?%%EXEBINDIR%%?${SML_BASERELATIVE}/bin?g' \
-	${FILESDIR}/pkg-install.in > ${PKGINSTALL}
 	PKG_PREFIX=${PREFIX} MULTIEXEC_WRAPPER_VERBOSE=yes \
 	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/lang/sml-nj/files/pkg-install.in b/lang/sml-nj/files/pkg-install.in
index 4750e0388775..cdc3840a86c7 100644
--- a/lang/sml-nj/files/pkg-install.in
+++ b/lang/sml-nj/files/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This file was automatically created - don't modify it!
 #%%SOURCEINFO-START%%
-# source version: $Id: pkg-install.in,v 1.15 2007/08/19 17:04:15 joemann Exp $
+# source version: $Id: pkg-install.in,v 1.17 2007/08/30 13:09:47 joemann Exp $
 # installed by port/package: %%SOURCEINFO-PACKAGE%%
 # installed from file: %%SOURCEINFO-FILE%%
 #%%SOURCEINFO-END%%
@@ -98,7 +98,7 @@ fi
 EPOCH=1
 CONFIG_FORMAT=1
 MAJOR=1
-MINOR=0
+MINOR=1
 VERSION=$EPOCH.$CONFIG_FORMAT.$MAJOR.$MINOR
 
 usage() {
@@ -130,7 +130,7 @@ version() {
 which() {
 	local name executable
 	name="$1"
-	lookup_executable "$CALLED_NAME"
+	lookup_executable "$name"
 	executable="$lookup_executable_result"
 	[ -z "$executable" ] && return 1
 	echo "$executable"