diff --git a/lang/go118/Makefile b/lang/go118/Makefile
index d059eeafb721..3ae392de7809 100644
--- a/lang/go118/Makefile
+++ b/lang/go118/Makefile
@@ -1,20 +1,20 @@
-DISTVERSION=	1.18.4
+DISTVERSION=	1.18.5
 # Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
-PORTREVISION=	1
+PORTREVISION=	0
 MASTER_SITES=	https://golang.org/dl/ \
 		https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
 		LOCAL/dmgk:bootstrap
 DISTFILES=	go${DISTVERSION}.src.tar.gz \
 		go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
 
 # Avoid conflicting patch files
 PATCHFILES=
 
 COMMENT=	Go programming language
 
 MASTERDIR=	${.CURDIR}/../go-devel
 PATCHDIR=	${.CURDIR}/files
 WRKSRC=		${WRKDIR}/go
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/go118/distinfo b/lang/go118/distinfo
index 91c7ba214065..4f38e43ade58 100644
--- a/lang/go118/distinfo
+++ b/lang/go118/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1657714348
-SHA256 (go1.18.4.src.tar.gz) = 4525aa6b0e3cecb57845f4060a7075aafc9ab752bb7b6b4cf8a212d43078e1e4
-SIZE (go1.18.4.src.tar.gz) = 22845866
+TIMESTAMP = 1659544915
+SHA256 (go1.18.5.src.tar.gz) = 9920d3306a1ac536cdd2c796d6cb3c54bc559c226fc3cc39c32f1e0bd7f50d2a
+SIZE (go1.18.5.src.tar.gz) = 22847094
 SHA256 (go-freebsd-arm64-go1.17.9.tar.xz) = d9e9180bdc5ad0eec1654679a50084ebb31ecbe9bef24f0bd8ba917db8d1830c
 SIZE (go-freebsd-arm64-go1.17.9.tar.xz) = 38572776
 SHA256 (go-freebsd-amd64-go1.17.9.tar.xz) = fd439ad091ed57d0ad728c05fc60465aad2e46e98da96e2d5b60b0c470f2efec
 SIZE (go-freebsd-amd64-go1.17.9.tar.xz) = 41951936
 SHA256 (go-freebsd-arm6-go1.17.9.tar.xz) = ba24590b8cec761207eafc5a39c71b5b5041320c6fb0c95d35c123f6054f8d1c
 SIZE (go-freebsd-arm6-go1.17.9.tar.xz) = 38938596
 SHA256 (go-freebsd-arm7-go1.17.9.tar.xz) = 9dc039278e174757962d100a227959037d4d7af18094af6433fa4d57cfa57e5f
 SIZE (go-freebsd-arm7-go1.17.9.tar.xz) = 38862156
 SHA256 (go-freebsd-386-go1.17.9.tar.xz) = 74854fd9e7d596c6abb1ecd55707c58a2f4d6ee875376e26bb5519889507291b
 SIZE (go-freebsd-386-go1.17.9.tar.xz) = 40566908
diff --git a/lang/go118/files/patch-src_cmd_compile_internal_noder_stencil.go b/lang/go118/files/patch-src_cmd_compile_internal_noder_stencil.go
deleted file mode 100644
index 350f3e289af8..000000000000
--- a/lang/go118/files/patch-src_cmd_compile_internal_noder_stencil.go
+++ /dev/null
@@ -1,18 +0,0 @@
-Revert "[release-branch.go1.18] cmd/compile: fix missing dict pass for type assertions"
-https://go-review.googlesource.com/c/go/+/417615
-
---- src/cmd/compile/internal/noder/stencil.go.orig	2022-07-12 15:22:53 UTC
-+++ src/cmd/compile/internal/noder/stencil.go
-@@ -1297,10 +1297,10 @@ func (g *genInst) dictPass(info *instInfo) {
- 				m = convertUsingDictionary(info, info.dictParam, m.Pos(), mce.X, m, m.Type(), false)
- 			}
- 		case ir.ODOTTYPE, ir.ODOTTYPE2:
--			dt := m.(*ir.TypeAssertExpr)
--			if !dt.Type().HasShape() && !dt.X.Type().HasShape() {
-+			if !m.Type().HasShape() {
- 				break
- 			}
-+			dt := m.(*ir.TypeAssertExpr)
- 			var rt ir.Node
- 			if dt.Type().IsInterface() || dt.X.Type().IsEmptyInterface() {
- 				ix := findDictType(info, m.Type())