diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index f41cb76a0af..c0f8b79cedf 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.50 2014/10/07 22:14:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.51 2015/06/10 13:07:33 sthen Exp $
 
 COMMENT=	manage remote serial consoles via TCP/IP
 
-DISTNAME=	conserver-8.2.0
+DISTNAME=	conserver-8.2.1
 CATEGORIES=	comms
 
 MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
diff --git a/comms/conserver/distinfo b/comms/conserver/distinfo
index 42e4f44e36b..ce74255d18e 100644
--- a/comms/conserver/distinfo
+++ b/comms/conserver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (conserver-8.2.0.tar.gz) = oFvre2bAIo7OYnhsPP5LAEjF1Qjgcvs2McK/RgyrkE8=
-SIZE (conserver-8.2.0.tar.gz) = 334326
+SHA256 (conserver-8.2.1.tar.gz) = JRrgGZfo8+51EGpbhOxvKo61/y+AkkOOujQ4SmFRU9A=
+SIZE (conserver-8.2.1.tar.gz) = 335241
diff --git a/comms/conserver/patches/patch-conserver_group_c b/comms/conserver/patches/patch-conserver_group_c
deleted file mode 100644
index 3608866a67c..00000000000
--- a/comms/conserver/patches/patch-conserver_group_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-conserver_group_c,v 1.5 2014/10/07 22:14:17 sthen Exp $
---- conserver/group.c.orig	Sun Apr 20 08:20:56 2014
-+++ conserver/group.c	Tue Oct  7 16:49:57 2014
-@@ -2553,7 +2553,7 @@ TelOpt(int o)
-     if (o < sizeof(telopts) / sizeof(char *))
- 	return telopts[o];
-     else {
--	sprintf(opt, "%d", o);
-+	snprintf(opt, sizeof(opt), "%d", o);
- 	return opt;
-     }
- }
diff --git a/comms/conserver/patches/patch-console_console_c b/comms/conserver/patches/patch-console_console_c
index d69e25cef26..9d1944e8284 100644
--- a/comms/conserver/patches/patch-console_console_c
+++ b/comms/conserver/patches/patch-console_console_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-console_console_c,v 1.5 2014/10/07 22:14:17 sthen Exp $
---- console/console.c.orig	Sun Apr 20 08:14:49 2014
-+++ console/console.c	Tue Oct  7 16:49:57 2014
-@@ -676,7 +676,7 @@ C2Raw(void)
+$OpenBSD: patch-console_console_c,v 1.6 2015/06/10 13:07:33 sthen Exp $
+--- console/console.c.orig	Mon Jun  1 16:36:59 2015
++++ console/console.c	Wed Jun 10 14:05:46 2015
+@@ -695,7 +695,7 @@ C2Raw(void)
  	Bye(EX_UNAVAILABLE);
      }
      n_tios = o_tios;