diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile
index dc4bdf7b24c..fb7aeb8aa17 100644
--- a/devel/go-tools/Makefile
+++ b/devel/go-tools/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2019/07/12 20:44:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2020/04/19 22:31:30 kn Exp $
 
 COMMENT =		various tools for the Go programming language
 GH_ACCOUNT =		golang
@@ -7,7 +7,7 @@ GH_COMMIT =		f727befe758c04ce68d52abc6e69ad111e2c6797
 DISTNAME =		go-tools-1.12.20190226
 CATEGORIES =		devel
 HOMEPAGE =		https://godoc.org/golang.org/x/tools
-REVISION =		0
+REVISION =		1
 
 # 3-clause BSD
 PERMIT_PACKAGE =	Yes
diff --git a/devel/go-tools/pkg/PLIST b/devel/go-tools/pkg/PLIST
index a8b5f5aef34..eb72461cc7f 100644
--- a/devel/go-tools/pkg/PLIST
+++ b/devel/go-tools/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.12 2019/03/16 13:42:06 jsing Exp $
+@comment $OpenBSD: PLIST,v 1.13 2020/04/19 22:31:30 kn Exp $
+@conflict ruby-shims-*
 @conflict stress-*
 @pkgpath textproc/godoc
 @rcscript ${RCDIR}/godoc
diff --git a/devel/ruby-shims/Makefile b/devel/ruby-shims/Makefile
index 50a593cce77..46245b7e12a 100644
--- a/devel/ruby-shims/Makefile
+++ b/devel/ruby-shims/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2019/10/15 01:29:49 jcs Exp $
+# $OpenBSD: Makefile,v 1.3 2020/04/19 22:31:30 kn Exp $
 
 COMMENT=	Ruby version redirection shim
 
 DISTNAME=	ruby-shims-2
 CATEGORIES=	devel
+REVISION=	0
 
 MAINTAINER=	joshua stein <jcs@openbsd.org>
 
diff --git a/devel/ruby-shims/pkg/PLIST b/devel/ruby-shims/pkg/PLIST
index f0b8784e786..419a14aa41e 100644
--- a/devel/ruby-shims/pkg/PLIST
+++ b/devel/ruby-shims/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/09/06 17:02:02 jcs Exp $
+@comment $OpenBSD: PLIST,v 1.2 2020/04/19 22:31:30 kn Exp $
+@conflict go-tools-*
 bin/_rubyshim
 bin/bundle
 bin/bundler