diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 3678c555684f..40f3d0036707 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sudo
 PORTVERSION=	1.8.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SUDO
 
diff --git a/security/sudo/files/patch-fix_bz208198 b/security/sudo/files/patch-fix_bz208198
new file mode 100644
index 000000000000..8ef2e1efea9e
--- /dev/null
+++ b/security/sudo/files/patch-fix_bz208198
@@ -0,0 +1,35 @@
+--- plugins/sudoers/pwutil.c	Thu Apr 28 15:27:53 2016 -0600
++++ plugins/sudoers/pwutil.c	Wed May 04 08:55:21 2016 -0600
+@@ -139,8 +139,8 @@
+ 	item = node->data;
+ 	sudo_debug_printf(SUDO_DEBUG_DEBUG,
+ 	    "%s: uid %u [%s] -> user %s [%s] (cache hit)", __func__,
+-	    (unsigned int)uid, key.registry, item->d.pw->pw_name,
+-	    item->registry);
++	    (unsigned int)uid, key.registry,
++	    item->d.pw ? item->d.pw->pw_name : "unknown", item->registry);
+ 	goto done;
+     }
+     /*
+@@ -202,8 +202,8 @@
+     if ((node = rbfind(pwcache_byname, &key)) != NULL) {
+ 	item = node->data;
+ 	sudo_debug_printf(SUDO_DEBUG_DEBUG,
+-	    "%s: user %s [%s] -> uid %u [%s] (cache hit)", __func__, name,
+-	    key.registry, (unsigned int)item->d.pw->pw_uid, item->registry);
++	    "%s: user %s [%s] -> uid %d [%s] (cache hit)", __func__, name,
++	    key.registry, item->d.pw ? (int)item->d.pw->pw_uid : -1, item->registry);
+ 	goto done;
+     }
+     /*
+@@ -461,8 +461,8 @@
+ 	item = node->data;
+ 	sudo_debug_printf(SUDO_DEBUG_DEBUG,
+ 	    "%s: gid %u [%s] -> group %s [%s] (cache hit)", __func__,
+-	    (unsigned int)gid, key.registry, item->d.gr->gr_name,
+-	    item->registry);
++	    (unsigned int)gid, key.registry,
++	    item->d.gr ? item->d.gr->gr_name : "unknown", item->registry);
+ 	goto done;
+     }
+     /*