diff --git a/net/zebra-devel/Makefile b/net/zebra-devel/Makefile
index 24377458d5ad..e0e4063e31be 100644
--- a/net/zebra-devel/Makefile
+++ b/net/zebra-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zebra
-PORTVERSION=	0.90a
-PORTREVISION=	3
+PORTVERSION=	0.91a
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
 
@@ -42,6 +41,7 @@ CONFIGURE_ARGS+=--disable-ospf6d --disable-ripngd
 .endif
 
 post-install:
+	@( cd ${WRKSRC}/doc; rm -f zebra*info*; ${MAKE} zebra.info install )
 	@${ECHO} "===>     installing zebra startup file..."
 	@${SED} -e "s=!!PREFIX!!=${PREFIX}=" \
 		< ${FILESDIR}/zebractl.sh  \
diff --git a/net/zebra-devel/distinfo b/net/zebra-devel/distinfo
index 6b27cda85028..e9a51f0707a2 100644
--- a/net/zebra-devel/distinfo
+++ b/net/zebra-devel/distinfo
@@ -1 +1 @@
-MD5 (zebra-0.90a.tar.gz) = 909db298e1d132e79288d92c09458ffe
+MD5 (zebra-0.91a.tar.gz) = cea38abb7d97fd96563077748a344ea5
diff --git a/net/zebra-devel/files/zebractl.sh b/net/zebra-devel/files/zebractl.sh
index 4de675bf1fb6..615239f3efcc 100644
--- a/net/zebra-devel/files/zebractl.sh
+++ b/net/zebra-devel/files/zebractl.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/net/zebra-devel/files/Attic/zebractl.sh,v 1.5 2001-01-29 22:12:54 andreas Exp $
+# $FreeBSD: /tmp/pcvs/ports/net/zebra-devel/files/Attic/zebractl.sh,v 1.6 2001-03-22 22:31:17 andreas Exp $
 #
 # zebra start/stop script by "Andreas Klemm <andreas@FreeBSD.ORG>"
 #
@@ -19,6 +19,10 @@ fi
 
 case $1 in
 	start)
+		if [ ! -f !!PREFIX!!/etc/zebra/zebra.conf ]; then
+			echo "error: zebra.conf config file is mandatory"
+			exit 1
+		fi
 		[ -f !!PREFIX!!/etc/zebra/zebra.conf ] \
 			&& !!PREFIX!!/sbin/zebra -d && echo -n ' zebra'
 		[ -f !!PREFIX!!/etc/zebra/ripd.conf ] \
diff --git a/net/zebra-devel/pkg-plist b/net/zebra-devel/pkg-plist
index ddc59b7219ab..10e30b77236a 100644
--- a/net/zebra-devel/pkg-plist
+++ b/net/zebra-devel/pkg-plist
@@ -4,7 +4,6 @@ sbin/ripd
 sbin/ripngd
 sbin/zebra
 sbin/zebractl
-etc/zebra/README.mbgp
 etc/zebra/bgpd.conf.sample
 etc/zebra/bgpd.conf.sample2
 etc/zebra/ospfd.conf.sample
diff --git a/net/zebra-devel/scripts/configure b/net/zebra-devel/scripts/configure
index e5bb2a6fed13..f2a02dc53a82 100644
--- a/net/zebra-devel/scripts/configure
+++ b/net/zebra-devel/scripts/configure
@@ -17,6 +17,7 @@ Select compile time options for zebra port:" -1 -1 8	\
 LIBPAM		"enable PAM authentication for vtysh"	OFF \
 OSPF_NSSA	"turn on undergoing NSSA feature"	OFF \
 SNMP		"enable SNMP support"			OFF \
+TCP-ZEBRA	"enable TCP/IP socket connection"	OFF \
 2> /tmp/zebra-checklist.$$
 
 retval=$?
@@ -50,6 +51,9 @@ while [ "$1" ]; do
 	\"SNMP\")
 		echo CONFIGURE_ARGS+=--enable-snmp
 		;;
+	\"TCP-ZEBRA\")
+		echo CONFIGURE_ARGS+=--enable-tcp-zebra
+		;;
     esac
     shift
 done
diff --git a/net/zebra-pj/Makefile b/net/zebra-pj/Makefile
index 24377458d5ad..e0e4063e31be 100644
--- a/net/zebra-pj/Makefile
+++ b/net/zebra-pj/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zebra
-PORTVERSION=	0.90a
-PORTREVISION=	3
+PORTVERSION=	0.91a
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
 
@@ -42,6 +41,7 @@ CONFIGURE_ARGS+=--disable-ospf6d --disable-ripngd
 .endif
 
 post-install:
+	@( cd ${WRKSRC}/doc; rm -f zebra*info*; ${MAKE} zebra.info install )
 	@${ECHO} "===>     installing zebra startup file..."
 	@${SED} -e "s=!!PREFIX!!=${PREFIX}=" \
 		< ${FILESDIR}/zebractl.sh  \
diff --git a/net/zebra-pj/distinfo b/net/zebra-pj/distinfo
index 6b27cda85028..e9a51f0707a2 100644
--- a/net/zebra-pj/distinfo
+++ b/net/zebra-pj/distinfo
@@ -1 +1 @@
-MD5 (zebra-0.90a.tar.gz) = 909db298e1d132e79288d92c09458ffe
+MD5 (zebra-0.91a.tar.gz) = cea38abb7d97fd96563077748a344ea5
diff --git a/net/zebra-pj/files/zebractl.sh b/net/zebra-pj/files/zebractl.sh
index 40a8a2ca59c4..f06ff92f66a7 100644
--- a/net/zebra-pj/files/zebractl.sh
+++ b/net/zebra-pj/files/zebractl.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/net/zebra-pj/files/Attic/zebractl.sh,v 1.5 2001-01-29 22:12:54 andreas Exp $
+# $FreeBSD: /tmp/pcvs/ports/net/zebra-pj/files/Attic/zebractl.sh,v 1.6 2001-03-22 22:31:17 andreas Exp $
 #
 # zebra start/stop script by "Andreas Klemm <andreas@FreeBSD.ORG>"
 #
@@ -19,6 +19,10 @@ fi
 
 case $1 in
 	start)
+		if [ ! -f !!PREFIX!!/etc/zebra/zebra.conf ]; then
+			echo "error: zebra.conf config file is mandatory"
+			exit 1
+		fi
 		[ -f !!PREFIX!!/etc/zebra/zebra.conf ] \
 			&& !!PREFIX!!/sbin/zebra -d && echo -n ' zebra'
 		[ -f !!PREFIX!!/etc/zebra/ripd.conf ] \
diff --git a/net/zebra-pj/pkg-plist b/net/zebra-pj/pkg-plist
index ddc59b7219ab..10e30b77236a 100644
--- a/net/zebra-pj/pkg-plist
+++ b/net/zebra-pj/pkg-plist
@@ -4,7 +4,6 @@ sbin/ripd
 sbin/ripngd
 sbin/zebra
 sbin/zebractl
-etc/zebra/README.mbgp
 etc/zebra/bgpd.conf.sample
 etc/zebra/bgpd.conf.sample2
 etc/zebra/ospfd.conf.sample
diff --git a/net/zebra-pj/scripts/configure b/net/zebra-pj/scripts/configure
index e5bb2a6fed13..f2a02dc53a82 100644
--- a/net/zebra-pj/scripts/configure
+++ b/net/zebra-pj/scripts/configure
@@ -17,6 +17,7 @@ Select compile time options for zebra port:" -1 -1 8	\
 LIBPAM		"enable PAM authentication for vtysh"	OFF \
 OSPF_NSSA	"turn on undergoing NSSA feature"	OFF \
 SNMP		"enable SNMP support"			OFF \
+TCP-ZEBRA	"enable TCP/IP socket connection"	OFF \
 2> /tmp/zebra-checklist.$$
 
 retval=$?
@@ -50,6 +51,9 @@ while [ "$1" ]; do
 	\"SNMP\")
 		echo CONFIGURE_ARGS+=--enable-snmp
 		;;
+	\"TCP-ZEBRA\")
+		echo CONFIGURE_ARGS+=--enable-tcp-zebra
+		;;
     esac
     shift
 done
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 24377458d5ad..e0e4063e31be 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zebra
-PORTVERSION=	0.90a
-PORTREVISION=	3
+PORTVERSION=	0.91a
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
 
@@ -42,6 +41,7 @@ CONFIGURE_ARGS+=--disable-ospf6d --disable-ripngd
 .endif
 
 post-install:
+	@( cd ${WRKSRC}/doc; rm -f zebra*info*; ${MAKE} zebra.info install )
 	@${ECHO} "===>     installing zebra startup file..."
 	@${SED} -e "s=!!PREFIX!!=${PREFIX}=" \
 		< ${FILESDIR}/zebractl.sh  \
diff --git a/net/zebra/distinfo b/net/zebra/distinfo
index 6b27cda85028..e9a51f0707a2 100644
--- a/net/zebra/distinfo
+++ b/net/zebra/distinfo
@@ -1 +1 @@
-MD5 (zebra-0.90a.tar.gz) = 909db298e1d132e79288d92c09458ffe
+MD5 (zebra-0.91a.tar.gz) = cea38abb7d97fd96563077748a344ea5
diff --git a/net/zebra/files/zebractl.sh b/net/zebra/files/zebractl.sh
index 140dc2713abc..78ff1890c964 100644
--- a/net/zebra/files/zebractl.sh
+++ b/net/zebra/files/zebractl.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/net/zebra/files/Attic/zebractl.sh,v 1.5 2001-01-29 22:12:54 andreas Exp $
+# $FreeBSD: /tmp/pcvs/ports/net/zebra/files/Attic/zebractl.sh,v 1.6 2001-03-22 22:31:17 andreas Exp $
 #
 # zebra start/stop script by "Andreas Klemm <andreas@FreeBSD.ORG>"
 #
@@ -19,6 +19,10 @@ fi
 
 case $1 in
 	start)
+		if [ ! -f !!PREFIX!!/etc/zebra/zebra.conf ]; then
+			echo "error: zebra.conf config file is mandatory"
+			exit 1
+		fi
 		[ -f !!PREFIX!!/etc/zebra/zebra.conf ] \
 			&& !!PREFIX!!/sbin/zebra -d && echo -n ' zebra'
 		[ -f !!PREFIX!!/etc/zebra/ripd.conf ] \
diff --git a/net/zebra/pkg-plist b/net/zebra/pkg-plist
index ddc59b7219ab..10e30b77236a 100644
--- a/net/zebra/pkg-plist
+++ b/net/zebra/pkg-plist
@@ -4,7 +4,6 @@ sbin/ripd
 sbin/ripngd
 sbin/zebra
 sbin/zebractl
-etc/zebra/README.mbgp
 etc/zebra/bgpd.conf.sample
 etc/zebra/bgpd.conf.sample2
 etc/zebra/ospfd.conf.sample
diff --git a/net/zebra/scripts/configure b/net/zebra/scripts/configure
index e5bb2a6fed13..f2a02dc53a82 100644
--- a/net/zebra/scripts/configure
+++ b/net/zebra/scripts/configure
@@ -17,6 +17,7 @@ Select compile time options for zebra port:" -1 -1 8	\
 LIBPAM		"enable PAM authentication for vtysh"	OFF \
 OSPF_NSSA	"turn on undergoing NSSA feature"	OFF \
 SNMP		"enable SNMP support"			OFF \
+TCP-ZEBRA	"enable TCP/IP socket connection"	OFF \
 2> /tmp/zebra-checklist.$$
 
 retval=$?
@@ -50,6 +51,9 @@ while [ "$1" ]; do
 	\"SNMP\")
 		echo CONFIGURE_ARGS+=--enable-snmp
 		;;
+	\"TCP-ZEBRA\")
+		echo CONFIGURE_ARGS+=--enable-tcp-zebra
+		;;
     esac
     shift
 done