diff --git a/build.sh b/build.sh
index d5c0250..a328e85 100644
--- a/build.sh
+++ b/build.sh
@@ -7,9 +7,9 @@ export GO111MODULE=on
 # Remove mod-cache on exit as its permissions are FUBAR
 trap "go clean -modcache" EXIT
 
-packages=($(cat tools.txt))
+packages=($(grep -v "^#" tools.txt))
 
 for package in "${packages[@]}"; do
-	echo -e "\e[96mBuilding ${package}...\e[m" >&2
-	go install "${package}"
+  echo -e "\e[96mBuilding ${package}...\e[m" >&2
+  go install "${package}"
 done
diff --git a/update_version.sh b/update_version.sh
index ad23cb5..2bb7b5a 100644
--- a/update_version.sh
+++ b/update_version.sh
@@ -1,15 +1,18 @@
 #!/bin/bash
 set -euo pipefail
 
+curl -sSf https://archlinux.org/packages/community/x86_64/go/json/ |
+  jq -r '"# " + .pkgname + " v" + .pkgver + "-" + .pkgrel' >tools.txt.new
+
 curl -sSfL "https://raw.githubusercontent.com/fatih/vim-go/master/plugin/go.vim" |
-	grep -Eo "\\ \['[^']*/[^']*'" |
-	tr -d "[' " |
-	sort >tools.txt.new
+  grep -Eo "\\ \['[^']*/[^']*'" |
+  tr -d "[' " |
+  sort >>tools.txt.new
 
 diff tools.txt tools.txt.new && {
-	echo "Up to date"
-	rm tools.txt.new
-	exit 0
+  echo "Up to date"
+  rm tools.txt.new
+  exit 0
 } || true
 
 mv tools.txt.new tools.txt