--- a/make-rules/setup.py.mk	Tue Apr 07 15:49:29 2015 -0700
+++ b/make-rules/setup.py.mk	Tue Apr 07 13:31:20 2015 -0700
@@ -18,6 +18,8 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
@@ -102,7 +104,7 @@
 	$(TOUCH) $@
 
 
-COMPONENT_INSTALL_ARGS +=	--root $(PROTO_DIR) 
+COMPONENT_INSTALL_ARGS +=	--root $(PROTO_DIR)
 COMPONENT_INSTALL_ARGS +=	--install-lib=$(PYTHON_LIB)
 COMPONENT_INSTALL_ARGS +=	--install-purelib=$(PYTHON_LIB)
 COMPONENT_INSTALL_ARGS +=	--install-platlib=$(PYTHON_LIB)
@@ -143,9 +145,13 @@
 clean::
 	$(RM) -r $(SOURCE_DIR) $(BUILD_DIR)
 
-# Make it easy to construct a URL for a pypi source download.
+# Make it easy to construct a URL for a pypi source download.  This
+# construct supports an optional call to a number from
+# NUM_EXTRA_ARCHIVES for multiple archive downloads.
 PYPI_BASE = http://pypi.python.org/packages/source
-pypi_url = $(PYPI_BASE)/$(shell echo $(COMPONENT_NAME) | cut -c1)/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+pypi_url_multi = $(shell echo $(COMPONENT_NAME_$(1)) | cut -c1)/$(COMPONENT_NAME_$(1))/$(COMPONENT_ARCHIVE_$(1))
+pypi_url_single = $(shell echo $(COMPONENT_NAME) | cut -c1)/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+pypi_url = $(PYPI_BASE)/$(if $(COMPONENT_NAME_$(1)),$(pypi_url_multi),$(pypi_url_single))
 
 ifneq ($(findstring 2.6, $(PYTHON_VERSIONS)),)
 REQUIRED_PACKAGES += runtime/python-26