diff --git a/go/.local/bin/install-go-home b/go/.local/bin/install-go-home
new file mode 100755
index 0000000..33ac837
--- /dev/null
+++ b/go/.local/bin/install-go-home
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -e
+
+# shellcheck disable=SC1090
+source "${XDG_DATA_HOME}/buddy-up/includes/utils.sh"
+
+APP=go
+VERSION=${VERSION:-1.16.5}
+DEST="${XDG_DATA_HOME}/apps/releases/${APP}"
+URL=https://dl.google.com/go/go${VERSION}.$(get_os)-$(get_arch).tar.gz
+
+extract_tarball "${URL}" "${DEST}/${VERSION}" "--strip-components 1"
+set_current_link "${DEST}" "${VERSION}"
+set_link "${XDG_BIN_HOME}/go"    "${DEST}" bin/go
+set_link "${XDG_BIN_HOME}/gofmt" "${DEST}" go/gofmt
diff --git a/go/.local/bin/install-gomock-home b/go/.local/bin/install-gomock-home
index 0c95852..2c0a4ad 100755
--- a/go/.local/bin/install-gomock-home
+++ b/go/.local/bin/install-gomock-home
@@ -8,13 +8,8 @@ source "${XDG_DATA_HOME}/buddy-up/includes/utils.sh"
 APP=mockgen
 VERSION=${VERSION:-1.6.0}
 DEST="${XDG_DATA_HOME}/apps/releases/gomock"
-CURRENT="${DEST}/current"
 URL=https://github.com/golang/mock/releases/download/v${VERSION}/mock_${VERSION}_$(get_os)_$(get_arch).tar.gz
 
 extract_tarball "${URL}" "${DEST}/${VERSION}" "--strip-components 1"
 set_current_link "${DEST}" "${VERSION}"
-
-unlink_if_set "${XDG_BIN_HOME}/${APP}"
-cd "${XDG_BIN_HOME}" || exit 1
-ln -s "$(relative_path "${XDG_BIN_HOME}" "${CURRENT}/${APP}")" "${APP}"
-cd - &> /dev/null || exit 1
+set_link "${XDG_BIN_HOME}/${APP}" "${DEST}" "${APP}"