diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index 0324684db362..ddad4cee960c 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -2,36 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	bzrtools
-PORTVERSION=	2.5
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	devel
-MASTER_SITES=	https://launchpadlibrarian.net/90479443/
+MASTER_SITES=	https://launchpad.net/bzrtools/stable/${PORTVERSION}/+download/
 
 MAINTAINER=	fullermd@over-yonder.net
 COMMENT=	Extensions to devel/bzr
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 OPTIONS_DEFINE=	GRAPHVIZ RSYNC
 GRAPHVIZ_DESC=	graphviz for graph-ancestry
 RSYNC_DESC=	rsync for rspush
-OPTIONS_DEFAULT=	RSYNC
 
 WRKSRC=	${WRKDIR}/bzrtools
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGVERSION=	2.5.0
 PYDISTUTILS_PKGNAME=	BzrTools
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGRAPHVIZ}
-RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
-.endif
-
-.if ${PORT_OPTIONS:MRSYNC}
-RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync
-.endif
+GRAPHVIZ_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
+RSYNC_RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
 
 .include <bsd.port.mk>
diff --git a/devel/bzrtools/distinfo b/devel/bzrtools/distinfo
index 46f8db89d403..a47a0eca4ae8 100644
--- a/devel/bzrtools/distinfo
+++ b/devel/bzrtools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bzrtools-2.5.tar.gz) = bccff6fba6129013f92a7bf16e73efad159cabd7957f4de765068044f730f03f
-SIZE (bzrtools-2.5.tar.gz) = 74508
+SHA256 (bzrtools-2.6.0.tar.gz) = 8b17fbba61dafc8dbefe1917a2ce084a8adc7650dee60add340615270dfb7f58
+SIZE (bzrtools-2.6.0.tar.gz) = 74748
diff --git a/devel/bzrtools/pkg-plist b/devel/bzrtools/pkg-plist
index 783243b3633a..815984d73418 100644
--- a/devel/bzrtools/pkg-plist
+++ b/devel/bzrtools/pkg-plist
@@ -64,6 +64,9 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/setup.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/setup.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/setup.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyo