diff --git a/sysutils/amazon-ssm-agent/Makefile b/sysutils/amazon-ssm-agent/Makefile
index 8bf89f4b804..3f707075fbf 100644
--- a/sysutils/amazon-ssm-agent/Makefile
+++ b/sysutils/amazon-ssm-agent/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.70 2020/02/21 11:26:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.71 2020/03/19 19:09:30 ajacoutot Exp $
 
 # i386: pty_openbsd.go:24:10: undefined: ptmget
 ONLY_FOR_ARCHS=		amd64
 
 COMMENT=		AWS SSM agent
 
-GH_TAGNAME=		2.3.871.0
+GH_TAGNAME=		2.3.930.0
 GH_ACCOUNT=		aws
 GH_PROJECT=		amazon-ssm-agent
 
diff --git a/sysutils/amazon-ssm-agent/distinfo b/sysutils/amazon-ssm-agent/distinfo
index faec0b6e822..b618ab88700 100644
--- a/sysutils/amazon-ssm-agent/distinfo
+++ b/sysutils/amazon-ssm-agent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (amazon-ssm-agent-2.3.871.0.tar.gz) = Asx1Z+XReyZCnZwqm1RnTFFX7qEWsji1YywVpe1ZA60=
-SIZE (amazon-ssm-agent-2.3.871.0.tar.gz) = 22201208
+SHA256 (amazon-ssm-agent-2.3.930.0.tar.gz) = ky03HT7xHfF5zjh6F64BC6qaBNBA6+Xv+0NiGJVvsfA=
+SIZE (amazon-ssm-agent-2.3.930.0.tar.gz) = 22201849
diff --git a/sysutils/amazon-ssm-agent/patches/patch-agent_platform_platform_unix_go b/sysutils/amazon-ssm-agent/patches/patch-agent_platform_platform_unix_go
index 6fdfcd57bfd..0c708094b8e 100644
--- a/sysutils/amazon-ssm-agent/patches/patch-agent_platform_platform_unix_go
+++ b/sysutils/amazon-ssm-agent/patches/patch-agent_platform_platform_unix_go
@@ -1,12 +1,12 @@
-$OpenBSD: patch-agent_platform_platform_unix_go,v 1.6 2019/12/20 13:27:05 ajacoutot Exp $
+$OpenBSD: patch-agent_platform_platform_unix_go,v 1.7 2020/03/19 19:09:30 ajacoutot Exp $
 
 Index: agent/platform/platform_unix.go
 --- agent/platform/platform_unix.go.orig
 +++ agent/platform/platform_unix.go
-@@ -148,6 +148,18 @@ func getPlatformDetails(log log.T) (name string, versi
- 		data := strings.Split(string(contentsBytes), " ")
- 		name = strings.TrimSpace(data[0])
- 		version = strings.TrimSpace(data[1])
+@@ -185,6 +185,20 @@ func getPlatformDetails(log log.T) (name string, versi
+ 		if len(data) >= 2 {
+ 			version = strings.TrimSpace(data[1])
+ 		}
 +	} else if runtime.GOOS == "openbsd" {
 +		log.Debugf(fetchingDetailsMessage, unameCommand)
 +
@@ -18,7 +18,9 @@ Index: agent/platform/platform_unix.go
 +
 +		data := strings.Split(string(contentsBytes), " ")
 +		name = strings.TrimSpace(data[0])
-+		version = strings.TrimSpace(data[1])
++		if len(data) >= 2 {
++			version = strings.TrimSpace(data[1])
++		}
  	} else {
  		log.Debugf(fetchingDetailsMessage, lsbReleaseCommand)
  
diff --git a/sysutils/amazon-ssm-agent/patches/patch-agent_plugins_inventory_gatherers_application_dataProvider_go b/sysutils/amazon-ssm-agent/patches/patch-agent_plugins_inventory_gatherers_application_dataProvider_go
new file mode 100644
index 00000000000..6db0e299d39
--- /dev/null
+++ b/sysutils/amazon-ssm-agent/patches/patch-agent_plugins_inventory_gatherers_application_dataProvider_go
@@ -0,0 +1,16 @@
+$OpenBSD: patch-agent_plugins_inventory_gatherers_application_dataProvider_go,v 1.1 2020/03/19 19:09:30 ajacoutot Exp $
+
+dataProvider.go:10:2: imported and not used: "github.com/aws/amazon-ssm-agent/agent/plugins/configurepackage/localpackages"
+gmake: *** [makefile:169: build-openbsd] Error 2
+
+Index: agent/plugins/inventory/gatherers/application/dataProvider.go
+--- agent/plugins/inventory/gatherers/application/dataProvider.go.orig
++++ agent/plugins/inventory/gatherers/application/dataProvider.go
+@@ -7,7 +7,6 @@ import (
+ 	"fmt"
+ 
+ 	"github.com/aws/amazon-ssm-agent/agent/context"
+-	"github.com/aws/amazon-ssm-agent/agent/plugins/configurepackage/localpackages"
+ 	"github.com/aws/amazon-ssm-agent/agent/plugins/inventory/model"
+ )
+