diff --git a/go-net/Makefile b/go-net/Makefile
index 7eb94692ff..f04de7716c 100644
--- a/go-net/Makefile
+++ b/go-net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/11/18 21:39:23 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2014/11/20 10:53:47 bsiegert Exp $
 #
 
 DISTNAME=		go-net
@@ -10,7 +10,7 @@ COMMENT=		Supplementary network libraries for Go
 LICENSE=		modified-bsd
 
 GO_SRCPATH=		golang.org/x/net
-GO_DIST_BASE=		go.net
+GO_DIST_BASE=		${DISTNAME}
 
 CHECKOUT_DATE=		2014-11-18
 HG_REPOSITORIES=	${DISTNAME}
diff --git a/go-net/PLIST b/go-net/PLIST
index f3d2e2162f..adf73929f9 100644
--- a/go-net/PLIST
+++ b/go-net/PLIST
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1 2014/11/18 21:39:23 bsiegert Exp $
-gopkg/pkg/${GOARCH}/golang.org/x/net/context.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/dict.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/html.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/html/atom.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/html/charset.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/idna.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/internal/iana.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/internal/icmp.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/internal/nettest.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/ipv4.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/ipv6.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/netutil.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/proxy.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/publicsuffix.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/spdy.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/webdav.a
-gopkg/pkg/${GOARCH}/golang.org/x/net/websocket.a
+@comment $NetBSD: PLIST,v 1.2 2014/11/20 10:53:47 bsiegert Exp $
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/context.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/dict.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/html.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/html/atom.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/html/charset.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/idna.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/internal/iana.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/internal/icmp.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/internal/nettest.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/ipv4.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/ipv6.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/netutil.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/proxy.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/publicsuffix.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/spdy.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/webdav.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/net/websocket.a
 gopkg/src/golang.org/x/net/AUTHORS
 gopkg/src/golang.org/x/net/CONTRIBUTORS
 gopkg/src/golang.org/x/net/LICENSE
diff --git a/go-text/Makefile b/go-text/Makefile
index ccf3de61a2..e04e38d189 100644
--- a/go-text/Makefile
+++ b/go-text/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/11/18 21:39:23 bsiegert Exp $
+# $NetBSD: Makefile,v 1.5 2014/11/20 10:53:47 bsiegert Exp $
 #
 
 DISTNAME=		go-text
@@ -10,8 +10,7 @@ COMMENT=		Supplementary text processing libraries for Go
 LICENSE=		modified-bsd
 
 GO_SRCPATH=		golang.org/x/text
-GO_DIST_BASE=		go.text
-WRKSRC=			${WRKDIR}/src/${GO_SRCPATH}
+GO_DIST_BASE=		${DISTNAME}
 
 CHECKOUT_DATE=		2014-11-18
 HG_REPOSITORIES=	${DISTNAME}
diff --git a/go-text/PLIST b/go-text/PLIST
index a03c376e36..ef0027dd9d 100644
--- a/go-text/PLIST
+++ b/go-text/PLIST
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.2 2014/11/18 21:39:23 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/11/20 10:53:47 bsiegert Exp $
 bin/colcmp
-gopkg/pkg/${GOARCH}/golang.org/x/text/cases.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/cldr.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/collate.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/collate/build.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/collate/colltab.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/display.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/encoding.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/encoding/charmap.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/encoding/japanese.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/encoding/korean.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/encoding/simplifiedchinese.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/encoding/traditionalchinese.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/encoding/unicode.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/internal/triegen.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/internal/ucd.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/language.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/transform.a
-gopkg/pkg/${GOARCH}/golang.org/x/text/unicode/norm.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/cases.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/cldr.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/collate.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/collate/build.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/collate/colltab.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/display.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/encoding.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/encoding/charmap.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/encoding/japanese.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/encoding/korean.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/encoding/simplifiedchinese.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/encoding/traditionalchinese.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/encoding/unicode.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/internal/triegen.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/internal/ucd.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/language.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/transform.a
+gopkg/pkg/${GO_PLATFORM}/golang.org/x/text/unicode/norm.a
 gopkg/src/golang.org/x/text/AUTHORS
 gopkg/src/golang.org/x/text/CONTRIBUTORS
 gopkg/src/golang.org/x/text/LICENSE