diff --git a/release/Makefile b/release/Makefile
index 1dde3b106149..081cdbf75115 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,186 +1,188 @@
 # $FreeBSD$
 #
 # Makefile for building releases and release media.
 # 
 # User-driven targets:
 #  cdrom: Builds release CD-ROM media (release.iso)
 #  memstick: Builds memory stick image (memstick)
 #  ftp: Sets up FTP distribution area (ftp)
 #  release: Build all media and FTP distribution area
 #  install: Copies all release media into ${DESTDIR}
 #
 # Variables affecting the build process:
 #  WORLDDIR: location of src tree -- must have built world and default kernel
 #            (by default, the directory above this one) 
 #  PORTSDIR: location of ports tree to distribute (default: /usr/ports)
 #  DOCDIR:   location of doc tree (default: /usr/doc)
 #  NOPORTS:  if set, do not distribute ports tree
 #  NOSRC:    if set, do not distribute source tree
 #  NODOC:    if set, do not generate release documentation
 #  TARGET/TARGET_ARCH: architecture of built release 
 #
 
 WORLDDIR?=	${.CURDIR}/..
 PORTSDIR?=	/usr/ports
 DOCDIR?=	/usr/doc
 RELNOTES_LANG?= en_US.ISO8859-1
 
-TARGET_ARCH?=	${MACHINE_ARCH}
-.if ${TARGET_ARCH} == ${MACHINE_ARCH}
 TARGET?=	${MACHINE}
+.if ${TARGET} == ${MACHINE}
+TARGET_ARCH?=	${MACHINE_ARCH}
 .else
-TARGET?=	${TARGET_ARCH}
+TARGET_ARCH?=	${TARGET}
 .endif
 IMAKE=		${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
 DISTDIR=	${.OBJDIR}/dist
 
 .if !exists(${DOCDIR})
 NODOC= true
 .endif
 .if !exists(${PORTSDIR})
 NOPORTS= true
 .endif
 
 EXTRA_PACKAGES= 
 .if !defined(NOPORTS)
 EXTRA_PACKAGES+= ports.txz
 .endif
 .if !defined(NOSRC)
 EXTRA_PACKAGES+= src.txz
 .endif
 .if !defined(NODOC)
 EXTRA_PACKAGES+= reldoc
 .endif
 
 RELEASE_TARGETS= ftp
 .if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
 RELEASE_TARGETS+= cdrom
 .endif
 .if exists(${.CURDIR}/${TARGET}/make-memstick.sh)
 RELEASE_TARGETS+= memstick
 .endif
 
 .include <bsd.obj.mk>
 
 base.txz:
 	-mkdir ${DISTDIR}
 	cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${DISTDIR}
 # Set up mergemaster root database
 	sh ${.CURDIR}/scripts/mm-mtree.sh -F \
 	    "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" -D "${DISTDIR}/base"
 # Merge handbook, etc. from doc tree into src tree doc distribution
 .if !defined(NODOC)
 	cd ${DOCDIR} && ${IMAKE} all install \
 	    DOCDIR=${DISTDIR}/doc/usr/share/doc 'FORMATS=html html-split txt' \
 	    INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES
 .endif
 	cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${DISTDIR}
 	mv ${DISTDIR}/*.txz ${.OBJDIR}
 
 kernel.txz:
 	-mkdir ${DISTDIR}
 	cd ${WORLDDIR} && ${IMAKE} distributekernel packagekernel DISTDIR=${DISTDIR}
 	mv ${DISTDIR}/kernel.txz ${.OBJDIR}
 
 src.txz:
 	-mkdir -p ${DISTDIR}/usr
 	ln -fs ${WORLDDIR} ${DISTDIR}/usr/src
 	cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/src.txz --exclude .svn \
 	    --exclude CVS usr/src
 
 ports.txz:
 	-mkdir -p ${DISTDIR}/usr
 	ln -fs ${PORTSDIR} ${DISTDIR}/usr/ports
 	cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/ports.txz \
 	    --exclude usr/ports/distfiles --exclude usr/ports/packages \
 	    --exclude 'usr/ports/INDEX*' --exclude work usr/ports
 
 reldoc:
 	cd ${.CURDIR}/doc && ${MAKE} all install clean 'FORMATS=html txt' \
 	    INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc
 	-mkdir ${.OBJDIR}/reldoc
 .for i in hardware readme relnotes errata
 	ln -f ${.OBJDIR}/rdoc/${RELNOTES_LANG}/${i}/article.txt \
 	    ${.OBJDIR}/reldoc/${i:U}.TXT
 	ln -f ${.OBJDIR}/rdoc/${RELNOTES_LANG}/${i}/article.html \
 	    ${.OBJDIR}/reldoc/${i:U}.HTM
 .endfor
 	cp ${.OBJDIR}/rdoc/${RELNOTES_LANG}/readme/docbook.css ${.OBJDIR}/reldoc
 
 system: packagesystem
 # Install system
 	-mkdir ${.OBJDIR}/release
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution DESTDIR=${.OBJDIR}/release
 	-rm ${.OBJDIR}/release/boot/kernel/*.symbols
 # Copy distfiles
 	mkdir ${.OBJDIR}/release/usr/freebsd-dist
 	cp ${.OBJDIR}/*.txz ${.OBJDIR}/MANIFEST \
 	    ${.OBJDIR}/release/usr/freebsd-dist
 # Copy documentation, if generated
 .if !defined(NODOC)
 	cp ${.OBJDIR}/reldoc/* ${.OBJDIR}/release
 .endif
 # Set up installation environment
 	ln -s /tmp/bsdinstall_etc/resolv.conf ${.OBJDIR}/release/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.OBJDIR}/release/etc/rc.conf
 	echo hostid_enable=\"NO\" >> ${.OBJDIR}/release/etc/rc.conf
 	cp ${.CURDIR}/rc.local ${.OBJDIR}/release/etc
 	touch ${.OBJDIR}/${.TARGET}
 
 bootonly: packagesystem
 # Install system
 	mkdir ${.OBJDIR}/bootonly
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
 	    DESTDIR=${.OBJDIR}/bootonly WITHOUT_AMD=1 WITHOUT_AT=1 \
 	    WITHOUT_BIND_DNSSEC=1 WITHOUT_BIND_ETC=1 WITHOUT_BIND_MTREE=1 \
 	    WITHOUT_BIND_NAMED=1 WITHOUT_GAMES=1 WITHOUT_GROFF=1 \
 	    WITHOUT_INSTALLLIB=1 WITHOUT_LIB32=1 WITHOUT_MAIL=1 \
 	    WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_RESCUE=1 WITHOUT_DICT=1
 	-rm ${.OBJDIR}/bootonly/boot/kernel/*.symbols
 # Copy manifest only (no distfiles) to get checksums
 	mkdir ${.OBJDIR}/bootonly/usr/freebsd-dist
 	cp ${.OBJDIR}/MANIFEST ${.OBJDIR}/bootonly/usr/freebsd-dist
 # Copy documentation, if generated
 .if !defined(NODOC)
 	cp ${.OBJDIR}/reldoc/* ${.OBJDIR}/bootonly
 .endif
 # Set up installation environment
 	ln -s /tmp/bsdinstall_etc/resolv.conf ${.OBJDIR}/bootonly/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.OBJDIR}/bootonly/etc/rc.conf
 	echo hostid_enable=\"NO\" >> ${.OBJDIR}/bootonly/etc/rc.conf
 	cp ${.CURDIR}/rc.local ${.OBJDIR}/bootonly/etc
 
 release.iso: system
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.OBJDIR}/release.iso ${.OBJDIR}/release
 
 bootonly.iso: bootonly
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.OBJDIR}/bootonly.iso ${.OBJDIR}/bootonly
 
 memstick: system
 	sh ${.CURDIR}/${TARGET}/make-memstick.sh ${.OBJDIR}/release ${.OBJDIR}/memstick
 
 packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
 	sh ${.CURDIR}/scripts/make-manifest.sh ${.OBJDIR}/*.txz > ${.OBJDIR}/MANIFEST
 	touch ${.TARGET}
 
 cdrom: release.iso bootonly.iso
 ftp: packagesystem
 	rm -rf ftp
 	mkdir ftp
 	cp *.txz MANIFEST ftp
 
-release: obj ${RELEASE_TARGETS}
+release:
+	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj
+	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS}
 
 clean:
 	chflags -R noschg ${.OBJDIR}
 	rm -rf dist ftp
 	rm -f packagesystem
 	rm -f *.txz MANIFEST
 	rm -f system
 	rm -rf release bootonly
 	rm -f release.iso bootonly.iso memstick
 
 install:
 	-mkdir ${DESTDIR}
 	cp -a *.iso memstick ftp ${DESTDIR}/
 
diff --git a/release/generate-release.sh b/release/generate-release.sh
index 62d052813f55..080512a89ee8 100755
--- a/release/generate-release.sh
+++ b/release/generate-release.sh
@@ -1,69 +1,68 @@
 #!/bin/sh
 
 # generate-release.sh: check out source trees, and build release components with
 #  totally clean, fresh trees.
 #
 #  Usage: generate-release.sh svn-branch scratch-dir
 #
 # Environment variables:
 #  CVSUP_HOST: Host of a cvsup server to obtain the ports and documentation
 #   trees. This or CVSROOT must be set to include ports and documentation.
 #  CVSROOT:    CVS root to obtain the ports and documentation trees. This or
 #   CVSUP_HOST must be set to include ports and documentation.
 #  CVS_TAG:    CVS tag for ports and documentation (HEAD by default)
 #  SVNROOT:    SVN URL to FreeBSD source repository (by default, 
 #   svn://svn.freebsd.org/base)
 #  MAKE_FLAGS: optional flags to pass to make (e.g. -j)
 # 
 #  Note: Since this requires a chroot, release cross-builds will not work!
 #
 # $FreeBSD$
 #
 
 mkdir -p $2/usr/src
 set -e # Everything must succeed
 
 svn co ${SVNROOT:-svn://svn.freebsd.org/base}/$1 $2/usr/src
 if [ ! -z $CVSUP_HOST ]; then
 	cat > $2/docports-supfile << EOF
 	*default host=$CVSUP_HOST
 	*default base=/var/db
 	*default prefix=/usr
 	*default release=cvs tag=${CVS_TAG:-.}
 	*default delete use-rel-suffix
 	*default compress
 	ports-all
 	doc-all
 EOF
 elif [ ! -z $CVSROOT ]; then
 	cd $2/usr
 	cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} ports
 	cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} doc
 fi
 
 cd $2/usr/src
 make $MAKE_FLAGS buildworld
 make installworld distribution DESTDIR=$2
 mount -t devfs devfs $2/dev
 trap "umount $2/dev" EXIT # Clean up devfs mount on exit
 
 if [ ! -z $CVSUP_HOST ]; then 
 	cp /etc/resolv.conf $2/etc/resolv.conf
 
 	# Checkout ports and doc trees
 	chroot $2 /usr/bin/csup /docports-supfile
 fi
 
 if [ -d $2/usr/doc ]; then 
 	cp /etc/resolv.conf $2/etc/resolv.conf
 
 	# Build ports to build the docs, then build the docs
 	chroot $2 /bin/sh -c 'pkg_add -r docproj || (cd /usr/ports/textproc/docproj && make install clean BATCH=yes WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes)'
 	chroot $2 make -C /usr/doc $MAKE_FLAGS 'FORMATS=html html-split txt' URLS_ABSOLUTE=YES
 fi
 
 chroot $2 make -C /usr/src $MAKE_FLAGS buildworld buildkernel
-chroot $2 make -C /usr/src/release obj
 chroot $2 make -C /usr/src/release release
 chroot $2 make -C /usr/src/release install DESTDIR=/R