diff --git a/.gitignore b/.gitignore
index 3791c79..2b5a367 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/python-novaclient-2.6.1~bzr83.tar.gz
+/python-novaclient-2.6.1~bzr89.tar.gz
diff --git a/python-novaclient.spec b/python-novaclient.spec
index bf7a335..b98ff13 100644
--- a/python-novaclient.spec
+++ b/python-novaclient.spec
@@ -1,8 +1,8 @@
-%global bzrtag 83
+%global bzrtag 89
 
 Name:             python-novaclient
 Version:          2.6.1
-Release:          0.3.%{bzrtag}bzr%{?dist}
+Release:          0.4.%{bzrtag}bzr%{?dist}
 Summary:          Python API and CLI for OpenStack Nova
 
 Group:            Development/Languages
@@ -41,7 +41,7 @@ the OpenStack Nova API.
 This package contains auto-generated documentation.
 
 %prep
-%setup -q -n python-novaclient-%{version}
+%setup -q
 
 %patch1 -p1
 
@@ -70,6 +70,10 @@ rm -fr html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
+* Wed Aug 24 2011 Mark McLoughlin <markmc@redhat.com> - 2.6.1-0.4.89bzr
+- Update to latest upstream snapshot
+- Don't use %setup -n (#732694)
+
 * Mon Aug 22 2011 Mark McLoughlin <markmc@redhat.com> - 2.6.1-0.3.83bzr
 - Remove python-devel BR
 - Remove the openstack-novaclient sub-package
diff --git a/sources b/sources
index b99ce42..c614f28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38a21b448e2d99ed26a872f72742830f  python-novaclient-2.6.1~bzr83.tar.gz
+9174a4bfcc46f7bf228a996bb27a24d1  python-novaclient-2.6.1~bzr89.tar.gz