diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 9e097ca18..5c9b56e97 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -17,7 +17,7 @@
 
 pkgname=go
 epoch=2
-pkgver=1.18.4
+pkgver=1.18.5
 pkgrel=1
 pkgdesc='Core compiler tools for the Go programming language'
 arch=(x86_64)
@@ -29,13 +29,11 @@ provides=(go-pie)
 options=(!strip staticlibs)
 source=(https://go.dev/dl/go${pkgver}.src.tar.gz{,.asc})
 validpgpkeys=('EB4C1BFD4F042F6DDDCCEC917721F63BD38B4796')
-sha256sums=('4525aa6b0e3cecb57845f4060a7075aafc9ab752bb7b6b4cf8a212d43078e1e4'
+sha256sums=('9920d3306a1ac536cdd2c796d6cb3c54bc559c226fc3cc39c32f1e0bd7f50d2a'
             'SKIP')
 
 case "$CARCH" in
   x86_64) export GOARCH=amd64 ;;
-  arm) export GOARCH=arm GOARM=5 ;;
-  armv6h) export GOARCH=arm GOARM=6 ;;
   armv7h) export GOARCH=arm GOARM=7 ;;
   aarch64) export GOARCH=arm64 ;;
 esac