diff --git a/slurm-wlm/Makefile b/slurm-wlm/Makefile
index bc5badd619..f59faf4172 100644
--- a/slurm-wlm/Makefile
+++ b/slurm-wlm/Makefile
@@ -31,6 +31,7 @@ CONFIGURE_ARGS+=	--with-munge=${BUILDLINK_PREFIX.munge}
 CONFIGURE_ARGS+=	--with-hwloc=${PREFIX}
 CONFIGURE_ARGS+=	--with-json=${PREFIX}
 CONFIGURE_ARGS+=	--with-libssh2=${PREFIX}
+CONFIGURE_ARGS.NetBSD+=	ac_cv_func_sched_setaffinity=yes
 
 LDFLAGS+=		-llz4
 
diff --git a/slurm-wlm/distinfo b/slurm-wlm/distinfo
index cc83a8784b..b234303192 100644
--- a/slurm-wlm/distinfo
+++ b/slurm-wlm/distinfo
@@ -5,6 +5,7 @@ RMD160 (slurm-19.05.5.tar.bz2) = 3f94274277a714e7b4bc4f89aa7b246316c4a732
 SHA512 (slurm-19.05.5.tar.bz2) = 4a0055a268b3765dbb2fa7510b27d694516e77716d857acea4509702e88b4739c9fff7590b80e33b7a62a5ebd38a748fd4ddf625f7c431b2beccb002d05df6c1
 Size (slurm-19.05.5.tar.bz2) = 6232295 bytes
 SHA1 (patch-etc_init.d.slurm.in) = beaedd5385b4aad04583d2bc5a23557519f74ec5
+SHA1 (patch-src_plugins_task_affinity_affinity.h) = a8fbc6182f1d7160addadadfcb174afa30c8ba80
 SHA1 (patch-src_slurmd_common_task__plugin.c) = 6049977521da86db4a437f1e76e26b3731eeef55
 SHA1 (patch-src_slurmd_common_task__plugin.h) = d4ad9f350efe1e873809adfe9dc4f559634e9ba2
 SHA1 (patch-src_slurmd_slurmd_slurmd.c) = 93f2da51d2a766a5817cc51e7de40e4ab2306649
diff --git a/slurm-wlm/patches/patch-src_plugins_task_affinity_affinity.h b/slurm-wlm/patches/patch-src_plugins_task_affinity_affinity.h
new file mode 100644
index 0000000000..2044ea53c7
--- /dev/null
+++ b/slurm-wlm/patches/patch-src_plugins_task_affinity_affinity.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+# Portability
+
+--- src/plugins/task/affinity/affinity.h.orig	2020-01-26 20:44:58.750715619 +0000
++++ src/plugins/task/affinity/affinity.h
+@@ -52,6 +52,10 @@
+    typedef cpuset_t cpu_set_t;
+ #endif
+ 
++#ifdef __NetBSD__
++#define	CPU_SETSIZE	MAXCPUS
++#endif
++
+ #ifdef HAVE_SYS_PRCTL_H
+ #  include <sys/prctl.h>
+ #endif