diff --git a/sysutils/packer/Makefile b/sysutils/packer/Makefile
index 7d3d8f386e4..92aa76dc97f 100644
--- a/sysutils/packer/Makefile
+++ b/sysutils/packer/Makefile
@@ -7,6 +7,7 @@ COMMENT=		tool for building machine images
 MODGO_MODNAME=		github.com/hashicorp/packer
 MODGO_VERSION=		v1.8.1
 DISTNAME=		packer-${MODGO_VERSION}
+REVISION=		1
 
 CATEGORIES=		sysutils
 
@@ -21,6 +22,8 @@ WANTLIB += c pthread
 
 MODULES=		lang/go
 
+WRKDIST=		${WRKDIR}/${MODGO_MODNAME}@${MODGO_VERSION}
+
 .include "modules.inc"
 
 post-install:
diff --git a/sysutils/packer/distinfo b/sysutils/packer/distinfo
index 1fef202c3c5..c9ddbd42ae2 100644
--- a/sysutils/packer/distinfo
+++ b/sysutils/packer/distinfo
@@ -1418,6 +1418,8 @@ SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.mod
 SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20210921155107-089bfa567519.mod) = zWMRYSoqpNDX4DxBs6ofvC1fiVqz9hCJ+rgL/p+PVIU=
 SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20220427172511-eb4f295cb31f.mod) = ryyI7r/wPjoq/ssbA2afxU6dEiyI97Ls/tBR7F28i7s=
 SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20220427172511-eb4f295cb31f.zip) = aQRjC0vG92e8AktUTEBSOadzpOb4OShgCesEdK3dGyg=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20220525230936-793ad666bf5e.mod) = ryyI7r/wPjoq/ssbA2afxU6dEiyI97Ls/tBR7F28i7s=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20220525230936-793ad666bf5e.zip) = C8pw2di3Lkt7CUf9ghq9+JQnwmmTiV+thvlpmSMscIc=
 SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod) = n/HQfKjAlFhFDrX0B2qgOQ71x9sMepQhUOiCWKeLU4M=
 SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod) = n/HQfKjAlFhFDrX0B2qgOQ71x9sMepQhUOiCWKeLU4M=
 SHA256 (go_modules/golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod) = ek5Zmvq0IQ2nxD5mNEEfLjs0WPkJhpB201EKjkS6JHw=
@@ -3368,6 +3370,8 @@ SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.mod)
 SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20210921155107-089bfa567519.mod) = 247
 SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20220427172511-eb4f295cb31f.mod) = 255
 SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20220427172511-eb4f295cb31f.zip) = 1776378
+SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20220525230936-793ad666bf5e.mod) = 255
+SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20220525230936-793ad666bf5e.zip) = 1778869
 SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod) = 24
 SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod) = 24
 SIZE (go_modules/golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod) = 327
diff --git a/sysutils/packer/modules.inc b/sysutils/packer/modules.inc
index 9be6c001d41..819048cb3b0 100644
--- a/sysutils/packer/modules.inc
+++ b/sysutils/packer/modules.inc
@@ -458,6 +458,7 @@ MODGO_MODULES =	\
 	go.uber.org/multierr						 v1.1.0 \
 	go.uber.org/zap							 v1.10.0 \
 	golang.org/x/crypto						 v0.0.0-20220427172511-eb4f295cb31f \
+	golang.org/x/crypto						 v0.0.0-20220525230936-793ad666bf5e \
 	golang.org/x/exp						 v0.0.0-20200331195152-e8c3332aa8e5 \
 	golang.org/x/image						 v0.0.0-20190802002840-cff245a6509b \
 	golang.org/x/lint						 v0.0.0-20210508222113-6edffad5e616 \
diff --git a/sysutils/packer/patches/patch-go_mod b/sysutils/packer/patches/patch-go_mod
new file mode 100644
index 00000000000..0b1cb4d512c
--- /dev/null
+++ b/sysutils/packer/patches/patch-go_mod
@@ -0,0 +1,12 @@
+Replace x/crypto after ssh-agent authentication with non-RSA keys was broken:
+https://github.com/golang/crypto/commit/46612604a0f90acbdd4722d44b8fd66ab69ed2a4
+
+Index: go.mod
+--- go.mod.orig
++++ go.mod
+@@ -266,3 +266,5 @@ require (
+ )
+ 
+ go 1.17
++
++replace golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f => golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
diff --git a/sysutils/packer/patches/patch-go_sum b/sysutils/packer/patches/patch-go_sum
new file mode 100644
index 00000000000..6fa89bb5326
--- /dev/null
+++ b/sysutils/packer/patches/patch-go_sum
@@ -0,0 +1,12 @@
+Index: go.sum
+--- go.sum.orig
++++ go.sum
+@@ -1253,6 +1253,8 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
+ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+ golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f h1:OeJjE6G4dgCY4PIXvIRQbE8+RX+uXZyGhUy/ksMGJoc=
+ golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
++golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
++golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+ golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+ golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=