--- a/make-rules/prep.mk	Thu Sep 02 11:08:43 2010 -0500
+++ b/make-rules/prep.mk	Sun Sep 19 15:50:53 2010 -0500
@@ -21,8 +21,8 @@
 # Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
 #
 
-UNPACK =	$(TOOLS)/unpack.py
-FETCH =		$(TOOLS)/fetch.py
+UNPACK =	$(WS_TOOLS)/userland-unpack
+FETCH =		$(WS_TOOLS)/userland-fetch
 
 ARCHIVES += $(COMPONENT_ARCHIVE)
 CLEAN_PATHS += $(COMPONENT_SRC)