Index: head/Mk/Uses/go.mk
===================================================================
--- head/Mk/Uses/go.mk
+++ head/Mk/Uses/go.mk
@@ -100,7 +100,6 @@
 .if ${go_ARGS:Mrun}
 RUN_DEPENDS+=	${GO_CMD}:${GO_PORT}
 .endif
-PLIST_SUB+=	GO_PKGNAME=${GO_PKGNAME}
 
 _USES_POST+=	go
 .endif # !defined(_INCLUDE_USES_GO_MK)
Index: head/databases/go-carbon/pkg-plist
===================================================================
--- head/databases/go-carbon/pkg-plist
+++ head/databases/go-carbon/pkg-plist
@@ -1,6 +1,6 @@
-bin/%%GO_PKGNAME%%
-@sample %%ETCDIR%%/%%GO_PKGNAME%%.conf.sample
+bin/go-carbon
+@sample %%ETCDIR%%/go-carbon.conf.sample
 @sample %%ETCDIR%%/storage-aggregation.conf.sample
 @sample %%ETCDIR%%/storage-schemas.conf.sample
-@dir(carbon,carbon,0750) /var/db/%%GO_PKGNAME%%
-@dir(carbon,carbon,0750) /var/log/%%GO_PKGNAME%%
+@dir(carbon,carbon,0750) /var/db/go-carbon
+@dir(carbon,carbon,0750) /var/log/go-carbon
Index: head/security/ct-submit/Makefile
===================================================================
--- head/security/ct-submit/Makefile
+++ head/security/ct-submit/Makefile
@@ -18,4 +18,6 @@
 GH_PROJECT= ct-submit
 GH_TAGNAME= 7bb2541
 
+PLIST_FILES=	bin/ct-submit
+
 .include <bsd.port.mk>
Index: head/security/ct-submit/pkg-plist
===================================================================
--- head/security/ct-submit/pkg-plist
+++ head/security/ct-submit/pkg-plist
@@ -1 +0,0 @@
-bin/%%GO_PKGNAME%%