diff --git a/net/exabgp/Makefile b/net/exabgp/Makefile
index e91ef310def0..f89315a406ef 100644
--- a/net/exabgp/Makefile
+++ b/net/exabgp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	exabgp
-PORTVERSION=	3.4.3
+PORTVERSION=	3.4.6
 CATEGORIES=	net
 MASTER_SITES=	GH GHC \
 		http://mirrors.rit.edu/zi/
@@ -15,8 +15,8 @@ LICENSE=	BSD3CLAUSE
 USE_GITHUB=	yes
 GH_ACCOUNT=	Exa-Networks
 GH_TAGNAME=	${PORTVERSION}
-GH_COMMIT=	500b9b1
-USES=		tar:tgz python
+GH_COMMIT=	48d9d76
+USES=		tar:tgz python:2
 SUB_FILES=	pkg-message exabgp.sh
 SUB_LIST=	PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_CMD=${PYTHON_CMD} \
 		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
diff --git a/net/exabgp/distinfo b/net/exabgp/distinfo
index 9066793185b5..5cfbe4790565 100644
--- a/net/exabgp/distinfo
+++ b/net/exabgp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (exabgp-3.4.3.tgz) = 30f094034dea313f39d5b72e556bf238c1f7552cd5ce8b1041e233affdccff23
-SIZE (exabgp-3.4.3.tgz) = 452267
+SHA256 (exabgp-3.4.6.tgz) = 7d144b0025e2a40f1816f451fdaa081f330fc545aba18d25a5dd8b7847099245
+SIZE (exabgp-3.4.6.tgz) = 544817
diff --git a/net/exabgp/pkg-plist b/net/exabgp/pkg-plist
index 9f800524f210..c02656ac9326 100644
--- a/net/exabgp/pkg-plist
+++ b/net/exabgp/pkg-plist
@@ -9,6 +9,8 @@ sbin/exabgp
 %%PYTHON_SITELIBDIR%%/exabgp/application/bgp.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/application/bmp.py
 %%PYTHON_SITELIBDIR%%/exabgp/application/bmp.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/application/cli.py
+%%PYTHON_SITELIBDIR%%/exabgp/application/cli.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/bgp/__init__.py
 %%PYTHON_SITELIBDIR%%/exabgp/bgp/__init__.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/bgp/message/__init__.py
@@ -169,30 +171,48 @@ sbin/exabgp
 %%PYTHON_SITELIBDIR%%/exabgp/compatibility/ordereddict.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/__init__.py
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/__init__.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/ancient.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/ancient.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bgp/__init__.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bgp/__init__.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bgp/capability.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bgp/capability.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bgp/family.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bgp/family.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bgp/neighbor.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bgp/neighbor.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bgp/process.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bgp/process.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bgp/session.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bgp/session.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bmp/__init__.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/bmp/__init__.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/check.py
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/check.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/__init__.py
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/__init__.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/location.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/location.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/parser.py
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/parser.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/raised.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/raised.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/reader.py
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/reader.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/registry.py
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/registry.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/section.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/section.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/tokeniser.py
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/engine/tokeniser.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/environment.py
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/environment.pyc
-%%PYTHON_SITELIBDIR%%/exabgp/configuration/file.py
-%%PYTHON_SITELIBDIR%%/exabgp/configuration/file.pyc
-%%PYTHON_SITELIBDIR%%/exabgp/configuration/neighbor/__init__.py
-%%PYTHON_SITELIBDIR%%/exabgp/configuration/neighbor/__init__.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/neighbor/capability.py
 %%PYTHON_SITELIBDIR%%/exabgp/configuration/neighbor/capability.pyc
-%%PYTHON_SITELIBDIR%%/exabgp/configuration/neighbor/family.py
-%%PYTHON_SITELIBDIR%%/exabgp/configuration/neighbor/family.pyc
-%%PYTHON_SITELIBDIR%%/exabgp/configuration/process.py
-%%PYTHON_SITELIBDIR%%/exabgp/configuration/process.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/setup.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/setup.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/usage.py
+%%PYTHON_SITELIBDIR%%/exabgp/configuration/usage.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/data/__init__.py
 %%PYTHON_SITELIBDIR%%/exabgp/data/__init__.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/data/check.py
@@ -201,10 +221,14 @@ sbin/exabgp
 %%PYTHON_SITELIBDIR%%/exabgp/debug.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/dep/__init__.py
 %%PYTHON_SITELIBDIR%%/exabgp/dep/__init__.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/dep/cmd2.py
+%%PYTHON_SITELIBDIR%%/exabgp/dep/cmd2.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/dep/docopt.py
 %%PYTHON_SITELIBDIR%%/exabgp/dep/docopt.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/dep/lsprofcalltree.py
 %%PYTHON_SITELIBDIR%%/exabgp/dep/lsprofcalltree.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/dep/pyparsing.py
+%%PYTHON_SITELIBDIR%%/exabgp/dep/pyparsing.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/logger.py
 %%PYTHON_SITELIBDIR%%/exabgp/logger.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/memory/__init__.py
@@ -277,6 +301,8 @@ sbin/exabgp
 %%PYTHON_SITELIBDIR%%/exabgp/util/__init__.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/util/cache.py
 %%PYTHON_SITELIBDIR%%/exabgp/util/cache.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/util/cmd2.py
+%%PYTHON_SITELIBDIR%%/exabgp/util/cmd2.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/util/coroutine.py
 %%PYTHON_SITELIBDIR%%/exabgp/util/coroutine.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/util/counter.py
@@ -289,6 +315,8 @@ sbin/exabgp
 %%PYTHON_SITELIBDIR%%/exabgp/util/ip.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/util/od.py
 %%PYTHON_SITELIBDIR%%/exabgp/util/od.pyc
+%%PYTHON_SITELIBDIR%%/exabgp/util/panic.py
+%%PYTHON_SITELIBDIR%%/exabgp/util/panic.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/util/trace.py
 %%PYTHON_SITELIBDIR%%/exabgp/util/trace.pyc
 %%PYTHON_SITELIBDIR%%/exabgp/util/usage.py
@@ -303,61 +331,19 @@ sbin/exabgp
 %%PYTHON_SITELIBDIR%%/netlink/test/get.pyc
 %%PYTHON_SITELIBDIR%%/netlink/test/route.py
 %%PYTHON_SITELIBDIR%%/netlink/test/route.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quagga/ibgpd.conf.v46
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quagga/ibgpd.conf.v4.parse.large
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quagga/ibgpd.conf.v4.parse
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quagga/ibgpd.conf.v4.md5
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quagga/ebgpd.conf.v6
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quagga/ebgpd.conf.v46
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quagga/ebgpd.conf.v4
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/processes/watchdog-1.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/processes/watchdog-1.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/processes/tcp-server
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/processes/stderr-1.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/processes/syslog-1.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/processes/read-write.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/processes/healthcheck.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/processes/dynamic-1.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/processes/dynamic-1.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp6-simple.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-withdrawn.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-watchdog.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-watchdog-dynamic.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-ttl.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-tcpcontrol.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-split.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-simple.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-parse.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-md5.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-multiple-process.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-label4.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-l2vpn-singleline.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-l2vpn.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-holdtime.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-healthcheck.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-group.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-group-updates.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-graceful.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-dynamic.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-add-path-sendreceive
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ibgp4-add-path-receive
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ebgp6-simple.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ebgp4-simple.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ebgp4-selfcheck
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ebgp4-peer-update.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ebgp4-multisession.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ebgp4-large.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ebgp4-juniper-flow.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ebgp4-family.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ebgp4-collector.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ebgp4-cisco.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/ebgp4-asn32.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/dual-neighbor.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exabgp/all_afi.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cisco/ibgp4-helper.txt
-%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/quagga
 %%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/exabgp/processes
 %%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/exabgp
-%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/cisco
 %%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%
 @dir %%PYTHON_SITELIBDIR%%/netlink/test
 @dir %%PYTHON_SITELIBDIR%%/netlink