diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 1c0b692d9ed..b88eb4518b7 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.20 2001/04/02 15:38:52 brad Exp $
+# $OpenBSD: Makefile,v 1.21 2001/08/16 07:30:39 peter Exp $
 # KAME Id: Makefile,v 1.5 1999/09/13 16:27:41 itojun Exp
 # Originally by: peter.galbavy@knowledge.com
 
 COMMENT=	"multi-threaded routing daemon"
 
-DISTNAME=	zebra-0.91a
+DISTNAME=	zebra-0.92
 CATEGORIES=	net
-NEED_VERSION=	1.383
-MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
+NEED_VERSION=	1.435
+MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/ \
+		ftp://ftp.knowledge.com/pub/mirrors/zebra/
 
 HOMEPAGE=	http://www.zebra.org/
 
@@ -24,25 +25,21 @@ PERMIT_DISTFILES_FTP=	Yes
 SYSCONFDIR=	/etc/zebra
 SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= --enable-vtysh
+CONFIGURE_ENV=	LIBS=-lcurses
 
-#
-# The snmp flavor doesn't quite work. The configue test for libsnmp.a
-# fails because the first test for it fails by not looking in
-# /usr/local/lib and the second uses the cached fail. Report sent to
-# zebra maintainers.
-#
 FLAVORS=	snmp
 FLAVOR?=
 
 .if ${FLAVOR:L:Msnmp}
-LIB_DEPENDS=	snmp.41::net/ucd-snmp
+LIB_DEPENDS=	snmp.42::net/ucd-snmp
 CONFIGURE_ARGS+= --enable-snmp
 .else
 CONFIGURE_ARGS+= --disable-snmp
 .endif
 
 post-extract:
-.for f in bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
+.for f in vtysh.1 bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
 	@cd ${WRKSRC}/doc; sed \
 		-e s#/usr/local/etc#@sysconfdir@#g \
 		-e s#/usr/local/sbin#@prefix@/sbin#g \
diff --git a/net/zebra/files/md5 b/net/zebra/files/md5
index 7cccf86a028..f542e88f400 100644
--- a/net/zebra/files/md5
+++ b/net/zebra/files/md5
@@ -1,3 +1,3 @@
-MD5 (zebra-0.91a.tar.gz) = cea38abb7d97fd96563077748a344ea5
-RMD160 (zebra-0.91a.tar.gz) = b0abd2d44675ce2f95b19feae2bb16440cec2cab
-SHA1 (zebra-0.91a.tar.gz) = e21ffff312a60fe8679b7c721dd62563c6dbf0f5
+MD5 (zebra-0.92.tar.gz) = f8d35843a2173dd846631a2d6b7a587e
+RMD160 (zebra-0.92.tar.gz) = f86743861d46615d35850bada59c9be2a109096f
+SHA1 (zebra-0.92.tar.gz) = bf68ce12cc0d49d968e3e017fe4850c48d853983
diff --git a/net/zebra/patches/patch-configure b/net/zebra/patches/patch-configure
index 06329feb337..40c4827ae6d 100644
--- a/net/zebra/patches/patch-configure
+++ b/net/zebra/patches/patch-configure
@@ -1,5 +1,22 @@
---- configure.orig	Sun Apr  1 22:30:46 2001
-+++ configure	Sun Apr  1 22:31:59 2001
+--- configure.orig	Wed Aug 15 10:26:51 2001
++++ configure	Wed Aug 15 10:27:28 2001
+@@ -3603,6 +3603,8 @@ fi
+ 
+ 
+ if test "${enable_snmp}" = "yes";then
++  old_libs="${LIBS}"
++  LIBS="-L/usr/local/lib"
+   unset ac_cv_lib_snmp_asn_parse_int
+   echo $ac_n "checking for asn_parse_int in -lsnmp""... $ac_c" 1>&6
+ echo "configure:3609: checking for asn_parse_int in -lsnmp" >&5
+@@ -3766,6 +3768,7 @@ fi
+ 
+ 	fi
+   fi
++  LIBS="${old_libs}"
+ 
+   if test "${HAVE_SNMP}" = ""; then
+ 	old_libs="${LIBS}"
 @@ -4242,7 +4242,7 @@
  
  cat >> $CONFIG_STATUS <<EOF
diff --git a/net/zebra/patches/patch-doc_Makefile.in b/net/zebra/patches/patch-doc_Makefile.in
index c08d3641b17..4d4632a9016 100644
--- a/net/zebra/patches/patch-doc_Makefile.in
+++ b/net/zebra/patches/patch-doc_Makefile.in
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	Sat Jan 27 20:55:00 2001
-+++ doc/Makefile.in	Mon Apr  2 10:56:59 2001
-@@ -72,7 +72,7 @@
+--- doc/Makefile.in.orig	Tue Aug  7 16:06:13 2001
++++ doc/Makefile.in	Wed Aug 15 10:22:25 2001
+@@ -72,7 +72,7 @@ KERNEL_METHOD = @KERNEL_METHOD@
  LIBPAM = @LIBPAM@
  LIB_IPV6 = @LIB_IPV6@
  LIB_REGEX = @LIB_REGEX@
@@ -9,7 +9,7 @@
  MULTIPATH_NUM = @MULTIPATH_NUM@
  OSPF6D = @OSPF6D@
  OSPFD = @OSPFD@
-@@ -133,46 +133,41 @@
+@@ -133,46 +133,41 @@ zebra.dvi: zebra.texi $(zebra_TEXINFOS)
  DVIPS = dvips
  
  .texi.info:
diff --git a/net/zebra/pkg/PLIST b/net/zebra/pkg/PLIST
index aa0c7b50a49..c39d0c16cc8 100644
--- a/net/zebra/pkg/PLIST
+++ b/net/zebra/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.9 2001/02/03 09:40:47 itojun Exp $
+@comment $OpenBSD: PLIST,v 1.10 2001/08/16 07:30:39 peter Exp $
+bin/vtysh
 sbin/bgpd
 sbin/ospfd
 sbin/ospf6d
@@ -23,5 +24,6 @@ share/examples/zebra/ripngd.conf.sample
 share/examples/zebra/zebra.conf.sample
 share/examples/zebra/ospfd.conf.sample
 share/examples/zebra/ospf6d.conf.sample
+share/examples/zebra/vtysh.conf.sample
 @dirrm share/doc/zebra
 @dirrm share/examples/zebra