diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index d87f22fb828d..0e2df97ae693 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bzrtools
-PORTVERSION=	0.8.1
+PORTVERSION=	0.9.1
 CATEGORIES=	devel
 MASTER_SITES=	http://panoramicfeedback.com/opensource/
 
diff --git a/devel/bzrtools/distinfo b/devel/bzrtools/distinfo
index ba401997370f..ba9c0d7d05bc 100644
--- a/devel/bzrtools/distinfo
+++ b/devel/bzrtools/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzrtools-0.8.1.tar.gz) = d1b913b55d5249d3ff007c756042b0df
-SHA256 (bzrtools-0.8.1.tar.gz) = 959a54598fc06b1b614fbb417085b86dbc83c53c0b358eeb7a0b5d534aa6cdd5
-SIZE (bzrtools-0.8.1.tar.gz) = 111029
+MD5 (bzrtools-0.9.1.tar.gz) = fa83f109556f8a6415d35d3ce2eb1774
+SHA256 (bzrtools-0.9.1.tar.gz) = a28ffadc0a3723b45e2998f4c9201d785728af0903594540e28ac35a841759a3
+SIZE (bzrtools-0.9.1.tar.gz) = 70250
diff --git a/devel/bzrtools/pkg-plist b/devel/bzrtools/pkg-plist
index ae37349c5e2f..6d0c75e720ee 100644
--- a/devel/bzrtools/pkg-plist
+++ b/devel/bzrtools/pkg-plist
@@ -6,22 +6,24 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/bzrtools.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/cbranch.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/clean_tree.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/colordiff.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/dotgraph.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/errors.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fai.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/graph.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/hunk_selector.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patches.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patchsource.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/progress.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shove.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/switch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/upstream_import.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/userinteractor.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/zap.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.pyc
@@ -32,22 +34,24 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/bzrtools.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/cbranch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/clean_tree.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/colordiff.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/dotgraph.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/errors.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fai.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/graph.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/hunk_selector.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patches.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patchsource.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/progress.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shove.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/switch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/upstream_import.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/userinteractor.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/zap.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/__init__.pyo
@@ -58,22 +62,26 @@
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/bzrtools.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/cbranch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/clean_tree.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/colordiff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/dotgraph.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fai.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/graph.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/fetch_ghosts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/hunk_selector.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/zap.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patches.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/patchsource.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/progress.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/rspush.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shelf.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shell.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/shove.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/switch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/terminal.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/test.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/upstream_import.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/userinteractor.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools/zap.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/bzrtools
+@dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib/plugins
+@dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib