diff --git a/DEVELOPERS b/DEVELOPERS
index fc189fa6449c..d75df5cc5509 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2515,7 +2515,7 @@ F:	package/dbus-broker/
 F:	package/systemd/
 F:	package/tcf-agent/
 
-N:	Yu Chien Peter Lin <peterlin@andestech.com>
+N:	Leo Yu-Chi Liang <ycliang@andestech.com>
 F:	board/andes
 F:	configs/andes_ae350_45_defconfig
 F:	package/andes-spi-burn/
diff --git a/package/go/Config.in.host b/package/go/Config.in.host
index 30260b573bcd..7e354b329882 100644
--- a/package/go/Config.in.host
+++ b/package/go/Config.in.host
@@ -78,13 +78,13 @@ config BR2_PACKAGE_HOST_GO_BIN
 
 endchoice
 
+endif
+
 config BR2_PACKAGE_PROVIDES_HOST_GO
 	string
-	# Default to host-go-src
+	# Default to host-go-bin unless src explicitly requested
 	default "host-go-src" if BR2_PACKAGE_HOST_GO_SRC
-	default "host-go-bin" if BR2_PACKAGE_HOST_GO_BIN
-
-endif
+	default "host-go-bin"
 
 source "package/go/go-bin/Config.in.host"
 source "package/go/go-bootstrap-stage1/Config.in.host"
diff --git a/package/skopeo/Config.in.host b/package/skopeo/Config.in.host
index 334a12b6fc5f..1c1c8f3ebe08 100644
--- a/package/skopeo/Config.in.host
+++ b/package/skopeo/Config.in.host
@@ -2,6 +2,7 @@ config BR2_PACKAGE_HOST_SKOPEO
 	bool "host skopeo"
 	depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_HOST_CGO_LINKING_SUPPORTS
+	select BR2_PACKAGE_HOST_GO
 	help
 	  skopeo is a command line utility that performs various
 	  operations on container images and image repositories.