--- a/components/python/pbr/Makefile	Fri May 30 08:19:47 2014 -0700
+++ b/components/python/pbr/Makefile	Fri May 30 13:54:38 2014 -0700
@@ -18,16 +18,16 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pbr
-COMPONENT_VERSION=	0.5.21
+COMPONENT_VERSION=	0.8.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:bba90ab981fc2c086650dad4413e4626cc8b199f1c848959469f26224d3ab381
+    sha256:aad1f8296aa6c5379c3ccb07cf7819a7482bb39a835b70d7e5faa4a00fa0876a
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://pypi.python.org/pypi/pbr/
 COMPONENT_BUGDB=	python-mod/pbr
@@ -38,17 +38,8 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-COMPONENT_TEST_DIR =    $(SOURCE_DIR)
-COMPONENT_TEST_ARGS =   setup.py test
-
-# required until d2to1 is added to the CBE
-D2TO1 = $(WS_COMPONENTS)/python/d2to1/build/prototype/$(MACH)/$(PYTHON_LIB)
-
-$(D2TO1):
-	(cd ../d2to1 ; gmake install)
-
-PYTHON_ENV += PYTHONPATH=$(D2TO1)
-$(BUILD_32):	$(D2TO1)
+COMPONENT_TEST_DIR =	$(SOURCE_DIR)
+COMPONENT_TEST_ARGS =	setup.py test
 
 # common targets
 build:		$(BUILD_NO_ARCH)