diff --git a/sysutils/nomad/Makefile b/sysutils/nomad/Makefile
index a8e4508a8611..c5b7cff4ebff 100644
--- a/sysutils/nomad/Makefile
+++ b/sysutils/nomad/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	nomad
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0.5
+DISTVERSION=	1.1.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Cluster manager and scheduler
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 GH_SUBDIR=	src/github.com/hashicorp/nomad
 USE_RC_SUBR=	nomad
 
 GO_BUILDFLAGS=	-tags ui \
 		-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}"
 
 USERS=		nomad
 GROUPS=		nomad
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/nomad
 	${INSTALL_DATA} ${WRKSRC}/dist/client.hcl ${STAGEDIR}${PREFIX}/etc/nomad/client.hcl.sample
 	${INSTALL_DATA} ${WRKSRC}/dist/server.hcl ${STAGEDIR}${PREFIX}/etc/nomad/server.hcl.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/nomad/distinfo b/sysutils/nomad/distinfo
index 9ce04e6c5636..971af90e2b37 100644
--- a/sysutils/nomad/distinfo
+++ b/sysutils/nomad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621045447
-SHA256 (hashicorp-nomad-v1.0.5_GH0.tar.gz) = e911f973a835adcd987fce9b7e75d1961645c716b1fce9b3203ac7c245cf47f5
-SIZE (hashicorp-nomad-v1.0.5_GH0.tar.gz) = 39542943
+TIMESTAMP = 1622079765
+SHA256 (hashicorp-nomad-v1.1.0_GH0.tar.gz) = cb9bb49a266b1720e78e6899e48e9dbfadd927d6a356e378980e4e398cfb4c78
+SIZE (hashicorp-nomad-v1.1.0_GH0.tar.gz) = 41044566
diff --git a/sysutils/nomad/files/patch-drivers_docker__driver_freebsd.go b/sysutils/nomad/files/patch-drivers_docker__driver_freebsd.go
new file mode 100644
index 000000000000..75ba0866cc87
--- /dev/null
+++ b/sysutils/nomad/files/patch-drivers_docker__driver_freebsd.go
@@ -0,0 +1,8 @@
+--- /dev/null	2021-05-26 18:56:01.401092000 -0700
++++ drivers/docker/driver_freebsd.go	2021-05-26 18:54:15.075568000 -0700
+@@ -0,0 +1,5 @@
++package docker
++
++func setCPUSetCgroup(path string, pid int) error {
++	return nil
++}
diff --git a/sysutils/nomad/files/patch-drivers_docker__driver_freebsd_test.go b/sysutils/nomad/files/patch-drivers_docker__driver_freebsd_test.go
new file mode 100644
index 000000000000..0e4b345905f9
--- /dev/null
+++ b/sysutils/nomad/files/patch-drivers_docker__driver_freebsd_test.go
@@ -0,0 +1,29 @@
+--- /dev/null	2021-05-26 18:56:22.470788000 -0700
++++ drivers/docker/driver_freebsd_test.go	2021-05-26 18:54:25.182401000 -0700
+@@ -0,0 +1,26 @@
++package docker
++
++import (
++	"fmt"
++	"os"
++	"testing"
++	"time"
++)
++
++// TestMain is a hacky test entrypoint to set temp directory to a path that can
++// be mounted into Docker containers on macOS without needing dev performing
++// special setup.
++//
++// macOS sets tempdir as `/var`, which Docker does not allowlist as a path that
++// can be bind-mounted.
++func TestMain(m *testing.M) {
++	tmpdir := fmt.Sprintf("/tmp/nomad-docker-tests-%d", time.Now().Unix())
++
++	defer os.Setenv("TMPDIR", os.Getenv("TMPDIR"))
++	os.Setenv("TMPDIR", tmpdir)
++
++	os.MkdirAll(tmpdir, 0700)
++	defer os.RemoveAll(tmpdir)
++
++	os.Exit(m.Run())
++}