diff --git a/misc/brltty/Makefile b/misc/brltty/Makefile
index 828738083af..121ac29ce3a 100644
--- a/misc/brltty/Makefile
+++ b/misc/brltty/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2004/09/15 17:54:15 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2004/11/14 17:34:05 naddy Exp $
 
 COMMENT=	"access software for a blind person using a braille terminal"
 
 SHARED_ONLY=	Yes
-DISTNAME=	brltty-3.5
+DISTNAME=	brltty-3.6
 CATEGORIES=	misc
 HOMEPAGE=	http://mielke.cc/brltty
 MASTER_SITES=	${HOMEPAGE}/releases/
@@ -20,7 +20,7 @@ USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--with-install-root=${WRKINST} \
 		--with-data-directory=${LOCALBASE}/share/brltty \
-		--without-flite
+		--without-flite --without-x
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/aux
 
 NO_REGRESS=	Yes
diff --git a/misc/brltty/distinfo b/misc/brltty/distinfo
index 078e6c298d9..8db0bb3b18d 100644
--- a/misc/brltty/distinfo
+++ b/misc/brltty/distinfo
@@ -1,3 +1,3 @@
-MD5 (brltty-3.5.tar.gz) = ba3b8c94e237d134c7a25011d285e26e
-RMD160 (brltty-3.5.tar.gz) = b1cb5a4fdcd243ea9db84224b3e8323cdfa2a150
-SHA1 (brltty-3.5.tar.gz) = 6102b4280c649263a85411088fb456e42bae5a1b
+MD5 (brltty-3.6.tar.gz) = 98790932a3cbc78d507bfa90a7e11f8c
+RMD160 (brltty-3.6.tar.gz) = 904eab1665715002b7b03d1766e0237bd67188a9
+SHA1 (brltty-3.6.tar.gz) = e77f0999ccaf5d98cee44c23269b997e28144fe8
diff --git a/misc/brltty/patches/patch-Programs_serial_c b/misc/brltty/patches/patch-Programs_serial_c
new file mode 100644
index 00000000000..f116a02e818
--- /dev/null
+++ b/misc/brltty/patches/patch-Programs_serial_c
@@ -0,0 +1,21 @@
+$OpenBSD: patch-Programs_serial_c,v 1.1 2004/11/14 17:34:05 naddy Exp $
+--- Programs/serial.c.orig	Thu Sep 30 15:13:52 2004
++++ Programs/serial.c	Fri Nov 12 22:09:16 2004
+@@ -192,6 +192,17 @@ serialInitializeAttributes (struct termi
+ #ifdef IEXTEN
+   attributes->c_lflag = IEXTEN;
+ #endif /* IEXTEN */
++
++#ifdef _POSIX_VDISABLE
++  if (_POSIX_VDISABLE) {
++    int i;
++    for (i=0; i<NCCS; ++i) {
++      if (i == VTIME) continue;
++      if (i == VMIN) continue;
++      attributes->c_cc[i] = _POSIX_VDISABLE;
++    }
++  }
++#endif /* _POSIX_VDISABLE */
+ }
+ 
+ static int
diff --git a/misc/brltty/pkg/PLIST b/misc/brltty/pkg/PLIST
index 0c9bb8d8c1e..3132238ee75 100644
--- a/misc/brltty/pkg/PLIST
+++ b/misc/brltty/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 17:54:15 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/11/14 17:34:06 naddy Exp $
 bin/brltty
 bin/brltty-config
 include/brltty/
 include/brltty/api.h
+include/brltty/api_protocol.h
 include/brltty/brldefs.h
 lib/brltty/
 lib/brltty/brltty-brl.lst
@@ -22,6 +23,7 @@ lib/brltty/libbrlttybmd.so
 lib/brltty/libbrlttybmn.so
 lib/brltty/libbrlttybpm.so
 lib/brltty/libbrlttybts.so
+lib/brltty/libbrlttybtt.so
 lib/brltty/libbrlttybva.so
 lib/brltty/libbrlttybvd.so
 lib/brltty/libbrlttybvh.so
@@ -36,7 +38,7 @@ lib/brltty/libbrlttysfv.so
 lib/brltty/libbrlttysgs.so
 lib/libbrlapi.a
 lib/libbrlapi.so
-lib/libbrlapi.so.0.2.0
+lib/libbrlapi.so.0.3.0
 @man man/man1/brltty.1
 @man man/man3/brlapi_closeConnection.3
 @man man/man3/brlapi_connection.3
@@ -52,7 +54,8 @@ lib/libbrlapi.so.0.2.0
 @man man/man3/brlapi_getDriverName.3
 @man man/man3/brlapi_getRaw.3
 @man man/man3/brlapi_getTty.3
-@man man/man3/brlapi_ignoreKeys.3
+@man man/man3/brlapi_ignoreKeyRange.3
+@man man/man3/brlapi_ignoreKeySet.3
 @man man/man3/brlapi_info.3
 @man man/man3/brlapi_initializeConnection.3
 @man man/man3/brlapi_keys.3
@@ -71,7 +74,8 @@ lib/libbrlapi.so.0.2.0
 @man man/man3/brlapi_settings_t.3
 @man man/man3/brlapi_strerror.3
 @man man/man3/brlapi_tty.3
-@man man/man3/brlapi_unignoreKeys.3
+@man man/man3/brlapi_unignoreKeyRange.3
+@man man/man3/brlapi_unignoreKeySet.3
 @man man/man3/brlapi_write.3
 @man man/man3/brlapi_writeBrl.3
 @man man/man3/brlapi_writeBrlDots.3
@@ -112,6 +116,7 @@ share/brltty/brltty-pm-ib_80.hlp
 share/brltty/brltty-pm.conf
 share/brltty/brltty-pm.hlp
 share/brltty/brltty-ts.hlp
+share/brltty/brltty-tt.hlp
 share/brltty/brltty-va.hlp
 share/brltty/brltty-vd.hlp
 share/brltty/brltty-vh.hlp
@@ -135,6 +140,7 @@ share/brltty/text.fi2.tbl
 share/brltty/text.fr-cbifs.tbl
 share/brltty/text.fr-iso01.tbl
 share/brltty/text.fr.tbl
+share/brltty/text.identity.tbl
 share/brltty/text.it.tbl
 share/brltty/text.nabcc.tbl
 share/brltty/text.no-h.tbl