diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 5851d819b43..1606749819d 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.54 2015/08/14 13:49:41 sthen Exp $
+# $OpenBSD: Makefile,v 1.55 2015/11/19 14:03:30 sthen Exp $
 
 COMMENT=	manage remote serial consoles via TCP/IP
 
 DISTNAME=	conserver-8.2.1
-REVISION=	1
+REVISION=	2
 CATEGORIES=	comms
 
 MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
diff --git a/comms/conserver/patches/patch-conserver_group_c b/comms/conserver/patches/patch-conserver_group_c
new file mode 100644
index 00000000000..db79c433fbb
--- /dev/null
+++ b/comms/conserver/patches/patch-conserver_group_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-conserver_group_c,v 1.7 2015/11/19 14:03:30 sthen Exp $
+--- conserver/group.c.orig	Thu Nov 19 13:55:52 2015
++++ conserver/group.c	Thu Nov 19 13:59:18 2015
+@@ -754,7 +754,7 @@ CheckPass(char *pcUser, char *pcWord, FLAG empty_check
+     struct spwd *spwd;
+ # endif
+ 
+-    if ((pwd = getpwnam(pcUser)) == (struct passwd *)0) {
++    if ((pwd = getpwnam_shadow(pcUser)) == (struct passwd *)0) {
+ 	CONDDEBUG((1, "CheckPass(): getpwnam(%s): %s", pcUser,
+ 		   strerror(errno)));
+ 	retval = AUTH_NOUSER;