diff --git a/lang/erlang-doc/Makefile b/lang/erlang-doc/Makefile
index 69a0d75e59d2..7fcddc6ae098 100644
--- a/lang/erlang-doc/Makefile
+++ b/lang/erlang-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/12/15 13:32:10 asau Exp $
+# $NetBSD: Makefile,v 1.7 2009/12/15 13:53:24 asau Exp $
 
 DISTNAME=		otp_doc_html_${DIST_VERSION_MAJOR}${DIST_VERSION_MINOR:D-${DIST_VERSION_MINOR}}
 PKGNAME=		erlang-doc-${ERLANG_VERSION}
@@ -31,10 +31,4 @@ do-install:
 
 .include "../../lang/erlang/Makefile.versions"
 
-# Generate PLIST
-.for _pkg_ _version_ in $(_VERSIONS)
-PRINT_PLIST_AWK+=	{if ($$0 ~ /\/$(_pkg_)-$(_version_)\//) {sub(/\/$(_pkg_)-$(_version_)\//,"/$(_pkg_)-$${VERSION.$(_pkg_)}/", $$0);}}
-.endfor
-PRINT_PLIST_AWK+=	{if ($$0 ~ /\/releases\/${DIST_VERSION_MAJOR}\//) {sub(/\/releases\/${DIST_VERSION_MAJOR}\//,"/releases/$${VERSION}/", $$0);}}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index b4ad49e9b456..1d3d20e160c8 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2009/12/15 12:07:57 asau Exp $
+# $NetBSD: Makefile,v 1.43 2009/12/15 13:53:24 asau Exp $
 
 DISTNAME=		otp_src_${DIST_VERSION_MAJOR}${DIST_VERSION_MINOR:D-${DIST_VERSION_MINOR}}
 PKGNAME=		erlang-${ERLANG_VERSION}
@@ -73,12 +73,6 @@ pre-build:
 post-install:
 	chmod -R go-w ${DESTDIR}${PREFIX}/lib/erlang/lib
 
-# Generate PLIST
-.for _pkg_ _version_ in $(_VERSIONS)
-PRINT_PLIST_AWK+=	{if ($$0 ~ /\/$(_pkg_)-$(_version_)\//) {sub(/\/$(_pkg_)-$(_version_)\//,"/$(_pkg_)-$${VERSION.$(_pkg_)}/", $$0);}}
-.endfor
-PRINT_PLIST_AWK+=	{if ($$0 ~ /\/releases\/${DIST_VERSION_MAJOR}\//) {sub(/\/releases\/${DIST_VERSION_MAJOR}\//,"/releases/$${VERSION}/", $$0);}}
-
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions
index a0c43dc734c2..d0b3f74f8026 100644
--- a/lang/erlang/Makefile.versions
+++ b/lang/erlang/Makefile.versions
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.versions,v 1.8 2009/12/15 13:33:47 asau Exp $
+# $NetBSD: Makefile.versions,v 1.9 2009/12/15 13:53:24 asau Exp $
 
 ERLANG_VERSION=			13.2.3
 DIST_VERSION_MAJOR=		R13B03
@@ -67,3 +67,9 @@ PLIST_SUBST+=	VERSION=${DIST_VERSION_MAJOR}
 VERSION.${name}=${version}
 PLIST_SUBST+=	VERSION.${name}=${version}
 .endfor
+
+# Generate PLIST
+.for _pkg_ _version_ in $(_VERSIONS)
+PRINT_PLIST_AWK+=	{if ($$0 ~ /\/$(_pkg_)-$(_version_)\//) {sub(/\/$(_pkg_)-$(_version_)\//,"/$(_pkg_)-$${VERSION.$(_pkg_)}/", $$0);}}
+.endfor
+PRINT_PLIST_AWK+=	{if ($$0 ~ /\/releases\/${DIST_VERSION_MAJOR}\//) {sub(/\/releases\/${DIST_VERSION_MAJOR}\//,"/releases/$${VERSION}/", $$0);}}