diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 2019750f85d..edff7b12ce2 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.69 2019/03/27 10:14:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.70 2019/03/27 10:37:09 sthen Exp $
 
 COMMENT=	manage remote serial consoles via TCP/IP
 
 V=		8.2.4
 DISTNAME=	conserver-$V
+REVISION=	0
 CATEGORIES=	comms
 
 MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
diff --git a/comms/conserver/patches/patch-conserver_Makefile_in b/comms/conserver/patches/patch-conserver_Makefile_in
deleted file mode 100644
index 70dcd28898a..00000000000
--- a/comms/conserver/patches/patch-conserver_Makefile_in
+++ /dev/null
@@ -1,41 +0,0 @@
-$OpenBSD: patch-conserver_Makefile_in,v 1.4 2014/09/08 16:12:11 sthen Exp $
---- conserver/Makefile.in.orig	Fri Sep 13 23:46:53 2013
-+++ conserver/Makefile.in	Tue Sep  2 20:29:22 2014
-@@ -37,7 +37,7 @@ CONSERVER_HDRS = ../config.h $(top_srcdir)/compat.h $(
- 		 $(srcdir)/group.h $(srcdir)/main.h $(srcdir)/master.h \
- 		 $(srcdir)/readcfg.h $(srcdir)/version.h
- 
--ALL = conserver convert
-+ALL = conserver conserver-convert
- 
- 
- all: $(ALL)
-@@ -47,8 +47,8 @@ $(CONSERVER_OBJS): $(CONSERVER_HDRS)
- conserver: $(CONSERVER_OBJS)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o conserver $(CONSERVER_OBJS) $(LIBS)
- 
--convert: convert.o cutil.o
--	$(CC) $(CFLAGS) $(LDFLAGS) -o convert convert.o cutil.o $(LIBS)
-+conserver-convert: convert.o cutil.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o conserver-convert convert.o cutil.o $(LIBS)
- 
- .c.o:
- 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-@@ -60,13 +60,9 @@ distclean: clean
- 	rm -f Makefile conserver.rc
- 
- install: conserver
--	$(MKDIR) $(DESTDIR)$(sbindir)
--	$(INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir)
--	$(MKDIR) $(DESTDIR)$(mandir)/man8
--	$(INSTALL) -m 0644 conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
--	$(MKDIR) $(DESTDIR)$(exampledir)
--	$(INSTALL) conserver.rc $(DESTDIR)$(exampledir)
--	$(MKDIR) $(DESTDIR)$(pkglibdir)
--	$(INSTALL) convert $(DESTDIR)$(pkglibdir)/convert
-+	$(BSD_INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir)
-+	$(BSD_INSTALL_MAN) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(exampledir)
-+	$(BSD_INSTALL_PROGRAM) conserver-convert $(DESTDIR)$(sbindir)
- 
- .PHONY: clean distclean install
diff --git a/comms/conserver/patches/patch-conserver_cf_Makefile_in b/comms/conserver/patches/patch-conserver_cf_Makefile_in
deleted file mode 100644
index 8be049b7309..00000000000
--- a/comms/conserver/patches/patch-conserver_cf_Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-conserver_cf_Makefile_in,v 1.3 2014/09/08 16:12:11 sthen Exp $
---- conserver.cf/Makefile.in.orig	Fri Sep 13 23:46:51 2013
-+++ conserver.cf/Makefile.in	Tue Sep  2 20:25:45 2014
-@@ -24,11 +24,10 @@ distclean: clean
- 	rm -f Makefile
- 
- install:
--	$(MKDIR) $(DESTDIR)$(mandir)/man5
--	$(INSTALL) -m 0644 conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5
--	$(INSTALL) -m 0644 conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5
--	$(MKDIR) $(DESTDIR)$(exampledir)
--	$(INSTALL) -m 0644 conserver.cf $(DESTDIR)$(exampledir)
--	$(INSTALL) -m 0644 conserver.passwd $(DESTDIR)$(exampledir)
-+	$(BSD_INSTALL_MAN) -m 0644 conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5
-+	$(BSD_INSTALL_MAN) -m 0644 conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(exampledir)
-+	$(BSD_INSTALL_DATA) -m 0644 conserver.cf $(DESTDIR)$(exampledir)
-+	$(BSD_INSTALL_DATA) -m 0644 conserver.passwd $(DESTDIR)$(exampledir)
- 
- .PHONY: clean distclean install
diff --git a/comms/conserver/patches/patch-conserver_consent_c b/comms/conserver/patches/patch-conserver_consent_c
index 07aeaf91610..cf17aa4b7ff 100644
--- a/comms/conserver/patches/patch-conserver_consent_c
+++ b/comms/conserver/patches/patch-conserver_consent_c
@@ -1,18 +1,20 @@
-$OpenBSD: patch-conserver_consent_c,v 1.7 2019/03/17 23:39:59 sthen Exp $
+$OpenBSD: patch-conserver_consent_c,v 1.8 2019/03/27 10:37:09 sthen Exp $
+
+XXX review
+
 Index: conserver/consent.c
 --- conserver/consent.c.orig
 +++ conserver/consent.c
-@@ -527,7 +527,8 @@ SetupTty(CONSENT *pCE, int fd)
+@@ -527,7 +527,7 @@ SetupTty(CONSENT *pCE, int fd)
      if (0 != tcgetattr(1, &n_tio)) {
  	exit(EX_OSERR);
      }
 -    n_tio.c_iflag &= ~(IGNCR | IUCLC);
-+
 +    n_tio.c_iflag &= ~(IGNCR);
      n_tio.c_iflag |= ICRNL;
      if (pCE->ixon == FLAGTRUE)
  	n_tio.c_iflag |= IXON;
-@@ -535,10 +536,8 @@ SetupTty(CONSENT *pCE, int fd)
+@@ -535,10 +535,8 @@ SetupTty(CONSENT *pCE, int fd)
  	n_tio.c_iflag |= IXANY;
      if (pCE->ixoff == FLAGTRUE)
  	n_tio.c_iflag |= IXOFF;
@@ -20,7 +22,7 @@ Index: conserver/consent.c
 -	~(OLCUC | ONOCR | ONLRET | OFILL | NLDLY | CRDLY | TABDLY | BSDLY);
      n_tio.c_oflag |= OPOST | ONLCR;
 -    n_tio.c_lflag &= ~(XCASE | NOFLSH | ECHOK | ECHONL);
-+    n_tio.c_lflag &= ~(NOFLSH|ECHOK|ECHONL);
++    n_tio.c_lflag &= ~(NOFLSH | ECHOK | ECHONL);
      n_tio.c_lflag |= ISIG | ICANON | ECHO;
      n_tio.c_cc[VEOF] = '\004';
      n_tio.c_cc[VEOL] = '\000';
diff --git a/comms/conserver/patches/patch-conserver_cutil_h b/comms/conserver/patches/patch-conserver_cutil_h
new file mode 100644
index 00000000000..6036f5eaba8
--- /dev/null
+++ b/comms/conserver/patches/patch-conserver_cutil_h
@@ -0,0 +1,19 @@
+$OpenBSD: patch-conserver_cutil_h,v 1.1 2019/03/27 10:37:09 sthen Exp $
+
+Index: conserver/cutil.h
+--- conserver/cutil.h.orig
++++ conserver/cutil.h
+@@ -12,10 +12,12 @@
+ # include <openssl/err.h>
+ # if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #  define TLS_method SSLv23_method
++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
++# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+ #  define CIPHER_SEC0
+ # else
+ #  define CIPHER_SEC0 ":@SECLEVEL=0"
+-# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
++# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
+ #endif
+ #if HAVE_GSSAPI
+ # include <gssapi/gssapi.h>
diff --git a/comms/conserver/patches/patch-conserver_group_c b/comms/conserver/patches/patch-conserver_group_c
index e1cb5ca4f95..602c012d429 100644
--- a/comms/conserver/patches/patch-conserver_group_c
+++ b/comms/conserver/patches/patch-conserver_group_c
@@ -1,4 +1,5 @@
-$OpenBSD: patch-conserver_group_c,v 1.8 2018/05/29 13:54:05 sthen Exp $
+$OpenBSD: patch-conserver_group_c,v 1.9 2019/03/27 10:37:09 sthen Exp $
+
 Index: conserver/group.c
 --- conserver/group.c.orig
 +++ conserver/group.c
diff --git a/comms/conserver/patches/patch-conserver_main_c b/comms/conserver/patches/patch-conserver_main_c
index ee5647bf5f5..778aa329722 100644
--- a/comms/conserver/patches/patch-conserver_main_c
+++ b/comms/conserver/patches/patch-conserver_main_c
@@ -1,7 +1,6 @@
-$OpenBSD: patch-conserver_main_c,v 1.5 2019/03/27 10:14:03 sthen Exp $
+$OpenBSD: patch-conserver_main_c,v 1.6 2019/03/27 10:37:10 sthen Exp $
 
 - enable "setproctitle" option by default, for more information in ps listings
-- libressl doesn't support @SECLEVEL=0
 
 Index: conserver/main.c
 --- conserver/main.c.orig
@@ -15,12 +14,3 @@ Index: conserver/main.c
  #endif
  #if HAVE_OPENSSL
  	, (char *)0, FLAGTRUE, FLAGFALSE, (char *)0
-@@ -369,7 +369,7 @@ SetupSSL(void)
- 	    }
- 	    ciphers = "ALL:!LOW:!EXP:!MD5:!aNULL:@STRENGTH";
- 	} else {
--	    ciphers = "ALL:aNULL:!LOW:!EXP:!MD5:@STRENGTH" CIPHER_SEC0;
-+	    ciphers = "ALL:aNULL:!LOW:!EXP:!MD5:@STRENGTH";
- 	}
- 	if (config->sslcacertificatefile != (char *)0) {
- 	    STACK_OF(X509_NAME) * cert_names;
diff --git a/comms/conserver/patches/patch-console_Makefile_in b/comms/conserver/patches/patch-console_Makefile_in
deleted file mode 100644
index 0ba4588cc32..00000000000
--- a/comms/conserver/patches/patch-console_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-console_Makefile_in,v 1.1 2015/08/14 13:49:41 sthen Exp $
---- console/Makefile.in.orig	Fri Aug 14 14:47:09 2015
-+++ console/Makefile.in	Fri Aug 14 14:47:20 2015
-@@ -55,7 +55,7 @@ distclean: clean
- 
- install: console
- 	$(MKDIR) $(DESTDIR)$(bindir)
--	$(INSTALL_PROGRAM) console $(DESTDIR)$(bindir)
-+	$(BSD_INSTALL_PROGRAM) console $(DESTDIR)$(bindir)
- 	$(MKDIR) $(DESTDIR)$(mandir)/man1
- 	$(INSTALL) -m 0644 console.man $(DESTDIR)$(mandir)/man1/console.1
- 
diff --git a/comms/conserver/patches/patch-console_console_c b/comms/conserver/patches/patch-console_console_c
index bed84f87420..9fd86b1c59c 100644
--- a/comms/conserver/patches/patch-console_console_c
+++ b/comms/conserver/patches/patch-console_console_c
@@ -1,19 +1,10 @@
-$OpenBSD: patch-console_console_c,v 1.8 2019/02/26 15:31:17 sthen Exp $
+$OpenBSD: patch-console_console_c,v 1.9 2019/03/27 10:37:10 sthen Exp $
 
-- don't use @SECLEVEL=0
+XXX review
 
 Index: console/console.c
 --- console/console.c.orig
 +++ console/console.c
-@@ -121,7 +121,7 @@ SetupSSL(void)
- # if defined(REQ_SERVER_CERT)
- 	    ciphers = "ALL:!LOW:!EXP:!MD5:!aNULL:@STRENGTH";
- # else
--	    ciphers = "ALL:aNULL:!LOW:!EXP:!MD5:@STRENGTH" CIPHER_SEC0;
-+	    ciphers = "ALL:aNULL:!LOW:!EXP:!MD5:@STRENGTH";
- # endif
- 	}
- 	SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, SSLVerifyCallback);
 @@ -693,7 +693,7 @@ C2Raw(void)
  	Bye(EX_UNAVAILABLE);
      }
diff --git a/comms/conserver/pkg/PLIST b/comms/conserver/pkg/PLIST
index 666bd09a49e..90b077d9466 100644
--- a/comms/conserver/pkg/PLIST
+++ b/comms/conserver/pkg/PLIST
@@ -1,16 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.16 2018/09/04 12:46:09 espie Exp $
+@comment $OpenBSD: PLIST,v 1.17 2019/03/27 10:37:10 sthen Exp $
 @newgroup _conserver:736
 @newuser _conserver:736:_conserver:daemon:Serial console server:/nonexistent:/sbin/nologin
 @extra /var/log/conserver
 @extraunexec rm -rf /var/consoles/*
 @rcscript ${RCDIR}/conserver
 @bin bin/console
+lib/conserver/
+@bin lib/conserver/convert
 @man man/man1/console.1
 @man man/man5/conserver.cf.5
 @man man/man5/conserver.passwd.5
 @man man/man8/conserver.8
 @bin sbin/conserver
-@bin sbin/conserver-convert
 share/doc/pkg-readmes/${PKGSTEM}
 share/examples/conserver/
 share/examples/conserver/README
@@ -21,6 +22,7 @@ share/examples/conserver/conserver.cf
 @sample ${SYSCONFDIR}/conserver.cf
 share/examples/conserver/conserver.passwd
 @sample ${SYSCONFDIR}/conserver.passwd
+@comment share/examples/conserver/conserver.rc
 share/examples/conserver/console.cf
 @sample ${SYSCONFDIR}/console.cf
 share/examples/conserver/simple.cf