Index: /openembedded/build/distro/zipit2-1.x.conf
===================================================================
--- /openembedded/build/distro/zipit2-1.x.conf (revision 37)
+++ /openembedded/build/distro/zipit2-1.x.conf (revision 42)
@@ -17,4 +17,6 @@
 DISTRO_TYPE = "debug"
 DISTRO_EXTRA_RDEPENDS += "ipkg ipkg-collateral"
+
+DISTRO_FEED_CONFIGS = ""
 
 #
Index: /openembedded/build/conf/local-zipit2.conf
===================================================================
--- /openembedded/build/conf/local-zipit2.conf (revision 39)
+++ /openembedded/build/conf/local-zipit2.conf (revision 42)
@@ -1,5 +1,5 @@
 MACHINE = "zipit2"
 DISTRO = "zipit2-1.x"
-UserBuildRootDir = ${BBUSERROOT}
+UserBuildRootDir = ${TOPDIR}
 
 BBFILES := "${UserBuildRootDir}/zipitZ2BBfiles/*/*.bb \
@@ -35,4 +35,4 @@
 # this allows you to have multiple local-*.conf files and
 # to switch between projects easily.
-TMPDIR = "${BBUSERROOT}/tmp.zipitZ2"
+TMPDIR = "${TOPDIR}/tmp.zipitZ2"
 
Index: /openembedded/README-zipit
===================================================================
--- /openembedded/README-zipit (revision 39)
+++ /openembedded/README-zipit (revision 42)
@@ -28,5 +28,5 @@
 
 1) To build the OE distro for the Z2, just enter the command:
-   'bitbake bootstrap-image'. When it finishes, look in the
+   'bitbake base-image'. When it finishes, look in the
    ${TMPDIR}/deploy/images for your bootstrap-XXXX.tar file.
    That is the filesystem that you would copy onto the ext3
Index: /openembedded/Makefile
===================================================================
--- /openembedded/Makefile (revision 39)
+++ /openembedded/Makefile (revision 42)
@@ -34,5 +34,5 @@
 	@echo "OpenZipit has been installed.  Edit your .bash_profile to"
 	@echo "add the BBPATH statement and add to your PATH.  Then, "
-	@echo "type 'bitbake bootstrap-image' to build a basic command line"
+	@echo "type 'bitbake base-image' to build a basic command line"
 	@echo "system to boot the zipit Z2 into Linux."
 	@echo
@@ -87,6 +87,4 @@
 	@echo "export PATH=\$$PATH:${TARGET_DIR}/bitbake/bin/"
 	@echo "export BBPATH=${TARGET_DIR}/build/:${TARGET_DIR}/org.openembedded.dev"
-	@echo "if you want to use local-zipit2.conf you need to add also this:"
-	@echo "export BBUSERROOT=${TARGET_DIR}"
 	@echo