diff --git a/sysutils/packer/Makefile b/sysutils/packer/Makefile
index 8cf17454622a..878535b4e8a0 100644
--- a/sysutils/packer/Makefile
+++ b/sysutils/packer/Makefile
@@ -13,11 +13,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PLIST_FILES=	bin/${PORTNAME}
 
+USES=	go
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 
-USES=	go
-
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-i386
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/packer/files/extra-patch-i386 b/sysutils/packer/files/extra-patch-i386
new file mode 100644
index 000000000000..259d5d21f308
--- /dev/null
+++ b/sysutils/packer/files/extra-patch-i386
@@ -0,0 +1,11 @@
+--- vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-01-01/network/expressroutecircuitpeerings.go.orig	2018-06-20 03:54:26 UTC
++++ vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-01-01/network/expressroutecircuitpeerings.go
+@@ -50,7 +50,7 @@ func (client ExpressRouteCircuitPeerings
+ 		{TargetValue: peeringParameters,
+ 			Constraints: []validation.Constraint{{Target: "peeringParameters.ExpressRouteCircuitPeeringPropertiesFormat", Name: validation.Null, Rule: false,
+ 				Chain: []validation.Constraint{{Target: "peeringParameters.ExpressRouteCircuitPeeringPropertiesFormat.PeerASN", Name: validation.Null, Rule: false,
+-					Chain: []validation.Constraint{{Target: "peeringParameters.ExpressRouteCircuitPeeringPropertiesFormat.PeerASN", Name: validation.InclusiveMaximum, Rule: 4294967295, Chain: nil},
++					Chain: []validation.Constraint{{Target: "peeringParameters.ExpressRouteCircuitPeeringPropertiesFormat.PeerASN", Name: validation.InclusiveMaximum, Rule: 2147483647, Chain: nil},
+ 						{Target: "peeringParameters.ExpressRouteCircuitPeeringPropertiesFormat.PeerASN", Name: validation.InclusiveMinimum, Rule: 1, Chain: nil},
+ 					}},
+ 				}}}}}); err != nil {