diff --git a/bzr/.footprint b/bzr/.footprint
index 4a1ef40ab..52f5062d1 100644
--- a/bzr/.footprint
+++ b/bzr/.footprint
@@ -4,7 +4,7 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python2.6/
 drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzr-1.18-py2.6.egg-info
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzr-2.0.1-py2.6.egg-info
 drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/__init__.pyc
@@ -166,6 +166,8 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/bundle/serializer/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/conflicts.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/counted_lock.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/counted_lock.pyc
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/crash.py
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/crash.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/debug.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/debug.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/decorators.py
@@ -197,6 +199,8 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/doc_generate/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/doc_generate/autodoc_man.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/doc_generate/autodoc_rstx.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/doc_generate/autodoc_rstx.pyc
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/doc_generate/sphinx_conf.py
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/doc_generate/sphinx_conf.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/email_message.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/email_message.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/errors.py
@@ -656,6 +660,8 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/commands/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/commands/test_update.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/fake_command.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/fake_command.pyc
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/features.py
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/features.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/file_utils.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/file_utils.pyc
 drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/ftp_server/
@@ -770,6 +776,8 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_lock/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_lock/test_lock.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_lock/test_temporary_write_lock.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_lock/test_temporary_write_lock.pyc
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_pack_repository.py
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_pack_repository.pyc
 drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_repository/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_repository/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_repository/__init__.pyc
@@ -886,6 +894,8 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_tree/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_tree/test_tree.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_tree/test_walkdirs.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_tree/test_walkdirs.pyc
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_versionedfile.py
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_versionedfile.pyc
 drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_workingtree/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_workingtree/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/per_workingtree/__init__.pyc
@@ -972,6 +982,9 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/ssl_certs/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/ssl_certs/__init__.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/ssl_certs/create_ssls.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/ssl_certs/create_ssls.pyc
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/ssl_certs/server.crt
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/ssl_certs/server_with_pass.key
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/ssl_certs/server_without_pass.key
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/stub_sftp.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/stub_sftp.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test__annotator.py
@@ -1038,6 +1051,8 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/ssl_certs/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_conflicts.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_counted_lock.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_counted_lock.pyc
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_crash.py
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_crash.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_debug.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_debug.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_decorators.py
@@ -1114,6 +1129,8 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/ssl_certs/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_lazy_import.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_lazy_regex.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_lazy_regex.pyc
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_lock.py
+-rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_lock.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_lockable_files.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_lockable_files.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_lockdir.py
@@ -1154,8 +1171,6 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/ssl_certs/
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_osutils_encodings.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_pack.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_pack.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_pack_repository.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_pack_repository.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_patch.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_patch.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_patches.py
@@ -1298,8 +1313,6 @@ drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_patches_d
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_version.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_version_info.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_version_info.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_versionedfile.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_versionedfile.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_weave.py
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_weave.pyc
 -rw-r--r--	root/root	usr/lib/python2.6/site-packages/bzrlib/tests/test_whitebox.py
diff --git a/bzr/.md5sum b/bzr/.md5sum
index 18f4bcf48..b5d198082 100644
--- a/bzr/.md5sum
+++ b/bzr/.md5sum
@@ -1 +1 @@
-efc91bada508089fbeb2d92973ecfe0a  bzr-1.18.tar.gz
+8b4d977e70efefeb7ba75d2b20900376  bzr-2.0.1.tar.gz
diff --git a/bzr/Pkgfile b/bzr/Pkgfile
index 4f947739b..bdd1582c2 100644
--- a/bzr/Pkgfile
+++ b/bzr/Pkgfile
@@ -5,9 +5,9 @@
 # Depends on: python
 
 name=bzr
-version=1.18
+version=2.0.1
 release=1
-source=(http://launchpad.net/$name/$version/$version/+download/$name-$version.tar.gz)
+source=(http://launchpad.net/$name/${version%.*}/$version/+download/$name-$version.tar.gz)
 
 build() {
   cd $name-$version