diff --git a/.rootkeys b/.rootkeys
index 9348b79523..381f182399 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -1059,7 +1059,9 @@
 3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/public/xen.h
 3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xen/ac_timer.h
 40715b2epYl2jBbxzz9CI2rgIca7Zg xen/include/xen/acpi.h
+41f2cea7ZvnB9JC4qkiq1K8H7xJw5Q xen/include/xen/banner.h
 3ddb79c0c0cX_DZE209-Bb-Rx1v-Aw xen/include/xen/cache.h
+41f2cea7Yna7xc0X9fyavIjoSFFeVg xen/include/xen/compile.h.in
 3f840f12CkbYSlwMrY2S11Mpyxg7Nw xen/include/xen/compiler.h
 3ddb79c259jh8hE7vre_8NuE7nwNSA xen/include/xen/config.h
 3eb165e0eawr3R-p2ZQtSdLWtLRN_A xen/include/xen/console.h
diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 272e240cbb..db46f3b6f3 100644
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -1,6 +1,7 @@
 *.a
 *.d
 *.o
+*.opic
 *.pyc
 *.so
 *.so.*
@@ -20,9 +21,29 @@ docs/*.log
 docs/*.pdf
 docs/*.ps
 docs/*.toc
+docs/figs/xenserver.eps
 docs/html/*
+docs/interface/WARNINGS
+docs/interface/images.pl
+docs/interface/images.tex
+docs/interface/img1.png
+docs/interface/index.html
+docs/interface/interface.css
+docs/interface/interface.html
+docs/interface/labels.pl
 docs/pdf/*
 docs/ps/*
+docs/user/WARNINGS
+docs/user/images.pl
+docs/user/images.tex
+docs/user/img1.png
+docs/user/img2.png
+docs/user/img3.png
+docs/user/index.html
+docs/user/internals.pl
+docs/user/labels.pl
+docs/user/user.css
+docs/user/user.html
 extras/mini-os/h/hypervisor-ifs
 install/*
 linux-*-xen0/*
@@ -55,9 +76,9 @@ tools/vnet/vnet-module/vnet_module.mod.*
 tools/vnetd/vnetd
 tools/web-shutdown.tap
 tools/x2d2/minixend
-tools/xentrace/xentrace
 tools/xcs/xcs
 tools/xcs/xcsdump
+tools/xentrace/xentrace
 tools/xfrd/xfrd
 xen/BLOG
 xen/arch/x86/asm-offsets.s
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index c7daeeea4b..d14c442f66 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -20,6 +20,7 @@ gm281@tetrapod.cl.cam.ac.uk
 iap10@freefall.cl.cam.ac.uk
 iap10@labyrinth.cl.cam.ac.uk
 iap10@nidd.cl.cam.ac.uk
+iap10@pb007.cl.cam.ac.uk
 iap10@striker.cl.cam.ac.uk
 iap10@tetris.cl.cam.ac.uk
 jws22@gauntlet.cl.cam.ac.uk
diff --git a/Makefile b/Makefile
index ed3891cc6c..c8d03f0eb9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,13 @@
 # Grand Unified Makefile for Xen.
 #
 
-DIST_DIR    ?= $(shell pwd)/dist
-INSTALL_DIR ?= $(DIST_DIR)/install
+DIST_DIR	:= $(CURDIR)/dist
+DESTDIR		:= $(DIST_DIR)/install
+
+INSTALL		:= install
+INSTALL_DIR	:= $(INSTALL) -d -m0755
+INSTALL_DATA	:= $(INSTALL) -m0644
+INSTALL_PROG	:= $(INSTALL) -m0755
 
 KERNELS ?= linux-2.6-xen0 linux-2.6-xenU
 # linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
@@ -14,7 +19,7 @@ ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
 XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
 
 
-export INSTALL_DIR
+export DESTDIR
 
 include buildconfigs/Rules.mk
 
@@ -35,34 +40,36 @@ install-tools:
 	$(MAKE) -C tools install
 
 install-kernels:
-	$(shell cp -a $(INSTALL_DIR)/boot/* /boot/)
-	$(shell cp -a $(INSTALL_DIR)/lib/modules/* /lib/modules/)
-	$(shell cp -dR $(INSTALL_DIR)/boot/*$(LINUX_VER)* $(prefix)/boot/)
-	$(shell cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/)
+	cp -a $(INSTALL_DIR)/boot/* /boot/
+	cp -a $(INSTALL_DIR)/lib/modules/* /lib/modules/
+	cp -dR $(INSTALL_DIR)/boot/*$(LINUX_VER)* $(prefix)/boot/
+	cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/
 
 install-docs:
 	sh ./docs/check_pkgs && $(MAKE) -C docs install || true
+	sh ./docs/check_pkgs
+	-$(MAKE) -C docs install
 
 # build and install everything into local dist directory
 dist: xen tools kernels docs
-	install -m0644 ./COPYING $(DIST_DIR)
-	install -m0644 ./README $(DIST_DIR)
-	install -m0755 ./install.sh $(DIST_DIR)
-	mkdir -p $(DIST_DIR)/check
-	install -m0755 tools/check/chk tools/check/check_* $(DIST_DIR)/check
+	$(INSTALL_DIR) $(DIST_DIR)/check
+	$(INSTALL_DATA) ./COPYING $(DIST_DIR)
+	$(INSTALL_DATA) ./README $(DIST_DIR)
+	$(INSTALL_PROG) ./install.sh $(DIST_DIR)
+	$(INSTALL_PROG) tools/check/chk tools/check/check_* $(DIST_DIR)/check
 
 xen:
-	$(MAKE) prefix=$(INSTALL_DIR) dist=yes -C xen install
+	$(MAKE) dist=yes -C xen install
 
 tools:
-	$(MAKE) prefix=$(INSTALL_DIR) dist=yes -C tools install
+	$(MAKE) dist=yes -C tools install
 
 kernels:
 	for i in $(XKERNELS) ; do $(MAKE) $$i-build || exit 1; done
 
 docs:
-	sh ./docs/check_pkgs && \
-		$(MAKE) prefix=$(INSTALL_DIR) dist=yes -C docs install || true
+	sh ./docs/check_pkgs
+	-$(MAKE) dist=yes -C docs install
 
 # Build all the various kernels and modules
 kbuild: kernels
@@ -103,20 +110,19 @@ mrproper: clean
 install-twisted:
 	wget http://www.twistedmatrix.com/products/get-current.epy
 	tar -zxf Twisted-*.tar.gz
-	( cd Twisted-* ; python setup.py install )
+	cd Twisted-* && python setup.py install
 
 install-logging: LOGGING=logging-0.4.9.2
 install-logging:
 	[ -f $(LOGGING).tar.gz ] || wget http://www.red-dove.com/$(LOGGING).tar.gz
 	tar -zxf $(LOGGING).tar.gz
-	( cd $(LOGGING) && python setup.py install )
+	cd $(LOGGING) && python setup.py install
 
 # handy target to upgrade iptables (use rpm or apt-get in preference)
 install-iptables:
 	wget http://www.netfilter.org/files/iptables-1.2.11.tar.bz2
-	tar -jxf iptables-*.tar.bz2
-	( cd iptables-* ; \
-	  make PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install)
+	tar -jxf iptables-1.2.11.tar.bz2
+	$(MAKE) -C iptables-1.2.11 PREFIX= KERNEL_DIR=../linux-$(LINUX_VER)-xen0 install
 
 help:
 	@echo 'Installation targets:'
diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
index b9f852eff8..c4f7fc359a 100644
--- a/buildconfigs/mk.linux-2.4-xen0
+++ b/buildconfigs/mk.linux-2.4-xen0
@@ -13,9 +13,11 @@ include buildconfigs/Rules.mk
 
 # The real action starts here!
 build: $(LINUX_DIR)/include/linux/autoconf.h
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
+	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
+	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
+	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
+	fi
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
 
 patches/tmp/ebtables.diff:
 	mkdir -p patches/tmp
diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
index a0937de4f6..1c589faba2 100644
--- a/buildconfigs/mk.linux-2.4-xenU
+++ b/buildconfigs/mk.linux-2.4-xenU
@@ -13,9 +13,11 @@ include buildconfigs/Rules.mk
 
 # The real action starts here!
 build: $(LINUX_DIR)/include/linux/autoconf.h
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen modules	
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
+	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
+	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
+	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
+	fi
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
 
 $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
 	rm -rf $(LINUX_DIR)
diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index 82179c6c74..eda5bb46d8 100644
--- a/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -15,9 +15,9 @@ include buildconfigs/Rules.mk
 build: $(LINUX_DIR)/include/linux/autoconf.h
 	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
 	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
-	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install ; \
+	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
 	fi
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
 
 $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
 	rm -rf $(LINUX_DIR)
diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index fa6e1109b3..ff6b47ff29 100644
--- a/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -15,9 +15,9 @@ include buildconfigs/Rules.mk
 build: $(LINUX_DIR)/include/linux/autoconf.h
 	if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
 	    $(MAKE) -C $(LINUX_DIR) ARCH=xen modules ; \
-	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install ; \
+	    $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
 	fi
-	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
+	$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
 
 $(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
 	rm -rf $(LINUX_DIR)
diff --git a/docs/Makefile b/docs/Makefile
index 86b5d8f1b1..46c2d38c59 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,8 +1,24 @@
+#!/usr/bin/make -f
 
-DOC_TEX  := $(wildcard src/*.tex)
-DOC_PS   := $(patsubst src/%.tex,ps/%.ps,$(DOC_TEX))
-DOC_PDF  := $(patsubst src/%.tex,pdf/%.pdf,$(DOC_TEX))
-DOC_HTML := $(patsubst src/%.tex,html/%/index.html,$(DOC_TEX))
+INSTALL		= install
+INSTALL_DIR	= $(INSTALL) -d -m0755
+
+PS2PDF		:= ps2pdf
+DVIPS		:= dvips
+LATEX		:= latex
+FIG2DEV		:= fig2dev
+TGIF		:= tgif
+LATEX2HTML	:= latex2html
+
+package		= xen
+prefix		= /usr
+docdir		= $(prefix)/share/doc
+pkgdocdir	= $(docdir)/$(package)
+
+DOC_TEX		:= $(wildcard src/*.tex)
+DOC_PS		:= $(patsubst src/%.tex,ps/%.ps,$(DOC_TEX))
+DOC_PDF		:= $(patsubst src/%.tex,pdf/%.pdf,$(DOC_TEX))
+DOC_HTML	:= $(patsubst src/%.tex,html/%/index.html,$(DOC_TEX))
 
 GFX  = $(patsubst %.obj, %.eps, $(wildcard figs/*.obj))
 GFX += $(patsubst %.fig, %.eps, $(wildcard figs/*.fig))
@@ -22,30 +38,34 @@ clean:
 	rm -rf $(GFX) ps pdf html
 
 install: all
-	rm -rf $(prefix)/usr/share/doc/xen
-	mkdir -p $(prefix)/usr/share/doc/xen
-	cp -dR ps $(prefix)/usr/share/doc/xen
-	cp -dR pdf $(prefix)/usr/share/doc/xen
-	cp -dR html $(prefix)/usr/share/doc/xen
+	rm -rf $(DESTDIR)$(pkgdocdir)
+	$(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
+	cp -dR ps $(DESTDIR)$(pkgdocdir)
+	cp -dR pdf $(DESTDIR)$(pkgdocdir)
+	cp -dR html $(DESTDIR)$(pkgdocdir)
 
 pdf/%.pdf: ps/%.ps
-	mkdir -p pdf ; ps2pdf $< $@
+	$(INSTALL_DIR) $(@D)
+	$(PS2PDF) $< $@.new
+	mv $@.new $@
 
 ps/%.ps: %.dvi
-	mkdir -p ps ; dvips -Ppdf -G0 -o $@ $<
+	$(INSTALL_DIR) $(@D)
+	$(DVIPS) -Ppdf -G0 -o $@.new $<
+	mv $@.new $@
 
 %.dvi: src/%.tex $(GFX)
-	latex $< >/dev/null
-	if [ -e $*.toc ] ; then latex $< >/dev/null ; fi
+	$(LATEX) $< >/dev/null
+	if [ -e $*.toc ] ; then $(LATEX) $< >/dev/null ; fi
 
 %.eps: %.fig
-	fig2dev -L eps $< $@
+	$(FIG2DEV) -L eps $< $@
 
 %.eps: %.obj
-	tgif -print -color -eps $<
+	$(TGIF) -print -color -eps $<
 
 html/%/index.html: src/%.tex
-	mkdir -p html/$*
-	latex2html -split 0 -show_section_numbers -toc_depth 3 -nonavigation \
-	-numbered_footnotes -local_icons -noinfo -math -dir html/$* \
+	$(INSTALL_DIR) $(@D)
+	$(LATEX2HTML) -split 0 -show_section_numbers -toc_depth 3 -nonavigation \
+	-numbered_footnotes -local_icons -noinfo -math -dir $(@D) \
 	$< 1>/dev/null 2>/dev/null
diff --git a/install.sh b/install.sh
index f21294f5f7..611e6e6417 100755
--- a/install.sh
+++ b/install.sh
@@ -23,6 +23,15 @@ if ! [ -d $dst ]; then
 fi
 
 echo "Installing Xen from '$src' to '$dst'..."
+cd $src/boot
+(echo '2.6.*' -2.6; echo '2.4.*' -2.4; echo '2.*.*' '') | while read mv
+do
+  l=$(eval ls -t vmlinuz-$m-xen0 2>/dev/null | head -n 1)
+  [ -e "$l" ] && ln -fs "$l" vmlinuz${v}-xen0
+  l=$(eval ls -t vmlinuz-$m-xenU 2>/dev/null | head -n 1)
+  [ -e "$l" ] && ln -fs "$l" vmlinuz${v}-xenU
+done
+cd -
 cp -fdR $src/* $dst
 echo "All done."
 
diff --git a/linux-2.4.29-xen-sparse/mkbuildtree b/linux-2.4.29-xen-sparse/mkbuildtree
index f20a23a58d..cabf622133 100755
--- a/linux-2.4.29-xen-sparse/mkbuildtree
+++ b/linux-2.4.29-xen-sparse/mkbuildtree
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # mkbuildtree <build tree>
 #
diff --git a/linux-2.6.10-xen-sparse/mkbuildtree b/linux-2.6.10-xen-sparse/mkbuildtree
index d353015ff2..8ab2d42a7c 100755
--- a/linux-2.6.10-xen-sparse/mkbuildtree
+++ b/linux-2.6.10-xen-sparse/mkbuildtree
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # mkbuildtree <build tree>
 #
diff --git a/netbsd-2.0-xen-sparse/mkbuildtree b/netbsd-2.0-xen-sparse/mkbuildtree
index 1877db8a5e..0d5330d115 100755
--- a/netbsd-2.0-xen-sparse/mkbuildtree
+++ b/netbsd-2.0-xen-sparse/mkbuildtree
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # mkbuildtree <build tree>
 #
diff --git a/tools/Makefile b/tools/Makefile
index 865af2c864..442c9317d0 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -27,7 +27,7 @@ endif
 	$(MAKE) -C ioemu install
 
 dist: $(TARGET)
-	$(MAKE) prefix=`pwd`/../dist/install dist=yes install
+	$(MAKE) prefix=$(CURDIR)/../dist/install dist=yes install
 
 clean:
 	$(MAKE) -C libxutil clean
diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 7bae4d9fbc..377fbdb3cc 100644
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -1,3 +1,7 @@
+INSTALL		= install
+INSTALL_DIR	= $(INSTALL) -d -m0755
+INSTALL_PROG	= $(INSTALL) -m0755
+INSTALL_DATA	= $(INSTALL) -m0644
 
 # Init scripts.
 XEND_INITD = init.d/xend
@@ -24,23 +28,23 @@ all:
 install: all install-initd install-configs install-scripts
 
 install-initd:
-	install -d $(prefix)/etc/init.d
-	install -m0755 $(XEND_INITD) $(prefix)/etc/init.d
-	install -m0755 $(XENDOMAINS_INITD) $(prefix)/etc/init.d
+	$(INSTALL_DIR) $(DESTDIR)/etc/init.d
+	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
+	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
 
 install-configs:
-	install -d $(prefix)$(XEN_CONFIG_DIR)
-	install -d $(prefix)$(XEN_CONFIG_DIR)/auto
+	$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
+	$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)/auto
 	for i in $(XEN_CONFIGS); \
-	    do [ -a $(prefix)/$(XEN_CONFIG_DIR)/$$i ] || \
-	    install -m0644 $$i $(prefix)$(XEN_CONFIG_DIR); \
+	    do [ -a $(DESTDIR)/$(XEN_CONFIG_DIR)/$$i ] || \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
 	done
 
 install-scripts:
-	install -d $(prefix)$(XEN_SCRIPT_DIR)
+	$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
 	for i in $(XEN_SCRIPTS); \
-	    do [ -a $(prefix)/$()/$$i ] || \
-	    install -m0755 $$i $(prefix)$(XEN_SCRIPT_DIR); \
+	    do [ -a $(DESTDIR)/$()/$$i ] || \
+	    $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
 	done
 
 clean:
diff --git a/tools/examples/init.d/xend b/tools/examples/init.d/xend
index 39324c7930..fc94c17dd2 100755
--- a/tools/examples/init.d/xend
+++ b/tools/examples/init.d/xend
@@ -32,14 +32,14 @@ case "$1" in
   status)
 	xend status
 	;;
-  restart|reload)
+  restart|reload|force-reload)
 	xend restart
 	await_daemons_up
 	;;
   *)
 	# do not advertise unreasonable commands that there is no reason
 	# to use with this device
-	echo $"Usage: $0 {start|stop|status|restart|reload}"
+	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload}"
 	exit 1
 esac
 
diff --git a/tools/examples/network b/tools/examples/network
index b679b93e43..229881d737 100755
--- a/tools/examples/network
+++ b/tools/examples/network
@@ -61,13 +61,13 @@ transfer_addrs () {
     local src=$1
     local dst=$2
     # Don't bother if $dst already has IP addresses.
-    if ip addr show dev ${dst} | egrep -q '^ *inet' ; then
+    if ip addr show dev ${dst} | egrep -q '^ *inet ' ; then
         return
     fi
     # Address lines start with 'inet' and have the device in them.
     # Replace 'inet' with 'ip addr add' and change the device name $src
     # to 'dev $src'. Remove netmask as we'll add routes later.
-    ip addr show dev ${src} | egrep '^ *inet' | sed -e "
+    ip addr show dev ${src} | egrep '^ *inet ' | sed -e "
 s/inet/ip addr add/
 s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)/[0-9]\+@\1@
 s/${src}/dev ${dst}/
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index d9304a0200..dc8a731d88 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -1,7 +1,12 @@
+INSTALL		= install
+INSTALL_PROG	= $(INSTALL) -m0755
+INSTALL_DATA	= $(INSTALL) -m0644
+INSTALL_DIR	= $(INSTALL) -d -m0755
 
-MAJOR    = 2.0
-MINOR    = 0
-SONAME   = libxc.so.$(MAJOR)
+MAJOR		:= 2.0
+MINOR		:= 0
+LIB_NAME	:= libxc
+SONAME		:= $(LIB_NAME).so.$(MAJOR)
 
 CC       = gcc
 
@@ -36,9 +41,10 @@ CFLAGS   += $(INCLUDES) -I.
 CFLAGS   += -Wp,-MD,.$(@F).d
 DEPS     = .*.d
 
-OBJS     = $(patsubst %.c,%.o,$(SRCS))
+OBJS     := $(patsubst %.c,%.o,$(SRCS))
+PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
 
-LIB      = libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR)
+LIB		:= $(LIB_NAME).a $(LIB_NAME).so $(LIB_NAME).so.$(MAJOR) $(LIB_NAME).so.$(MAJOR).$(MINOR)
 
 all: check-for-zlib mk-symlinks
 	$(MAKE) $(LIB)
@@ -63,15 +69,15 @@ mk-symlinks:
 	  ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . )
 
 install: all
-	mkdir -p $(prefix)/usr/lib
-	mkdir -p $(prefix)/usr/include
-	install -m0755 $(LIB) $(prefix)/usr/lib
-	ln -sf libxc.so.$(MAJOR).$(MINOR) $(prefix)/usr/lib/libxc.so.$(MAJOR)
-	ln -sf libxc.so.$(MAJOR) $(prefix)/usr/lib/libxc.so
-	install -m0644 xc.h $(prefix)/usr/include
+	$(INSTALL_DIR) $(DESTDIR)/usr/lib
+	$(INSTALL_DIR) $(DESTDIR)/usr/include
+	$(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
+	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
+	ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so
+	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
 
 clean:
-	rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
+	rm -rf *.a *.so *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen TAGS
 
 rpm: all
 	rm -rf staging
@@ -82,11 +88,17 @@ rpm: all
 	mv staging/i386/*.rpm .
 	rm -rf staging
 
-libxc.so:
-	ln -sf libxc.so.$(MAJOR) $@
-libxc.so.$(MAJOR):
-	ln -sf libxc.so.$(MAJOR).$(MINOR) $@
-libxc.so.$(MAJOR).$(MINOR): $(OBJS)
+$(PIC_OBJS): %.opic: %.c
+	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
+
+$(LIB_NAME).a: $(OBJS)
+	$(AR) rc $@ $^
+
+$(LIB_NAME).so: $(LIB_NAME).so.$(MAJOR)
+	ln -sf $< $@
+$(LIB_NAME).so.$(MAJOR): $(LIB_NAME).so.$(MAJOR).$(MINOR)
+	ln -sf $< $@
+$(LIB_NAME).so.$(MAJOR).$(MINOR): $(PIC_OBJS)
 	$(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -L../libxutil -lxutil -lz
 
 .PHONY: TAGS clean install mk-symlinks rpm
diff --git a/tools/libxutil/Makefile b/tools/libxutil/Makefile
index b9034b5b8f..9efb826b0b 100644
--- a/tools/libxutil/Makefile
+++ b/tools/libxutil/Makefile
@@ -1,4 +1,9 @@
 XEN_ROOT = ../..
+INSTALL		= install
+INSTALL_DATA	= $(INSTALL) -m0644
+INSTALL_PROG	= $(INSTALL) -m0755
+INSTALL_DIR	= $(INSTALL) -d -m0755
+
 include $(XEN_ROOT)/tools/Make.defs
 
 CC = gcc
@@ -19,6 +24,7 @@ LIB_SRCS += sys_string.c
 LIB_SRCS += util.c
 
 LIB_OBJS := $(LIB_SRCS:.c=.o)
+LIB_PIC_OBJS := $(LIB_SRCS:.c=.opic)
 
 CFLAGS   += -Wall
 CFLAGS   += -Werror
@@ -33,6 +39,7 @@ DEPS     = .*.d
 MAJOR    := 2.0
 MINOR    := 0
 LIB_NAME := libxutil
+SO_NAME  := $(LIB_NAME).so.$(MAJOR)
 LIB      := $(LIB_NAME).so 
 LIB      += $(LIB_NAME).so.$(MAJOR)
 LIB      += $(LIB_NAME).so.$(MAJOR).$(MINOR)
@@ -41,14 +48,17 @@ LIB      += $(LIB_NAME).a
 all: check-for-zlib
 	$(MAKE) $(LIB)
 
+$(LIB_PIC_OBJS): %.opic: %.c
+	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) -fPIC -c -o $@ $<
+
 $(LIB_NAME).so: $(LIB_NAME).so.$(MAJOR)
 	ln -sf $^ $@
 
 $(LIB_NAME).so.$(MAJOR): $(LIB_NAME).so.$(MAJOR).$(MINOR)
 	ln -sf $^ $@
 
-$(LIB_NAME).so.$(MAJOR).$(MINOR): $(LIB_OBJS)
-	$(CC) -Wl,-soname -Wl,$(LIB_NAME).so.$(MAJOR) -shared -o $@ $^
+$(LIB_NAME).so.$(MAJOR).$(MINOR): $(LIB_PIC_OBJS)
+	$(CC) -Wl,-soname -Wl,$(SO_NAME) -shared -o $@ $^
 
 $(LIB_NAME).a: $(LIB_OBJS)
 	$(AR) rc $@ $^
@@ -62,13 +72,13 @@ check-for-zlib:
 	fi
 
 install: all
-	mkdir -p $(prefix)/usr/lib
-	install -m0755 $(LIB) $(prefix)/usr/lib
-	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(prefix)/usr/lib/$(LIB_NAME).so.$(MAJOR)
-	ln -sf $(LIB_NAME).so.$(MAJOR) $(prefix)/usr/lib/$(LIB_NAME).so
+	$(INSTALL_DIR) -p $(DESTDIR)/usr/lib
+	$(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/lib
+	ln -sf $(LIB_NAME).so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so.$(MAJOR)
+	ln -sf $(LIB_NAME).so.$(MAJOR) $(DESTDIR)/usr/lib/$(LIB_NAME).so
 
 clean:
-	$(RM) *.a *.so *.so.* *.o *.rpm 
+	$(RM) *.a *.so *.so.* *.o *.opic *.rpm 
 	$(RM) *~
 	$(RM) $(DEPS)
 
diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index 7c20e8d1b0..84166c72fc 100644
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -1,3 +1,6 @@
+INSTALL		= install
+INSTALL_PROG	= $(INSTALL) -m0755
+INSTALL_DIR	= $(INSTALL) -d -m0755
 
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Make.defs
@@ -20,10 +23,10 @@ all: $(TARGETS)
 	$(MAKE) -C miniterm
 
 install: all
-	mkdir -p $(prefix)/usr/bin
-	mkdir -p $(prefix)/usr/sbin
-	install -m0755 $(INSTALL_BIN) $(prefix)/usr/bin
-	install -m0755 $(INSTALL_SBIN) $(prefix)/usr/sbin
+	$(INSTALL_DIR) $(DESTDIR)/usr/bin
+	$(INSTALL_DIR) $(DESTDIR)/usr/sbin
+	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
+	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
 	$(MAKE) -C miniterm install
 
 clean:
diff --git a/tools/misc/miniterm/Makefile b/tools/misc/miniterm/Makefile
index 86e1bf0ccf..e85ee3738e 100644
--- a/tools/misc/miniterm/Makefile
+++ b/tools/misc/miniterm/Makefile
@@ -1,3 +1,6 @@
+INSTALL		= install
+INSTALL_PROG	= $(INSTALL) -m0755
+INSTALL_DIR	= $(INSTALL) -d -m0755
 
 CC     = gcc
 CFLAGS = -Wall -O3
@@ -6,8 +9,8 @@ TARGET = miniterm
 all: $(TARGET)
 
 install: all
-	mkdir -p $(prefix)/usr/bin
-	install -m0755 $(TARGET) $(prefix)/usr/bin
+	$(INSTALL_DIR) $(DESTDIR)/usr/bin
+	$(INSTALL_PROG) $(TARGET) $(DESTDIR)/usr/bin
 
 clean:
 	$(RM) *.o $(TARGET) *~
diff --git a/tools/python/Makefile b/tools/python/Makefile
index a3f4face53..9d39bd85b4 100644
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -3,7 +3,11 @@ all:
 	python setup.py build
 
 install: all
-	python setup.py install --home="$(prefix)/usr"
+	if [ "$(DESTDIR)" = "" ]; then                   \
+	    python setup.py install;                     \
+	else                                             \
+	    python setup.py install --root="$(DESTDIR)"; \
+	fi
 
 clean:
 	rm -rf build *.pyc *.pyo *.o *.a *~
diff --git a/tools/python/xen/sv/params.py b/tools/python/xen/sv/params.py
index 16b764f088..beed647a4f 100644
--- a/tools/python/xen/sv/params.py
+++ b/tools/python/xen/sv/params.py
@@ -1,3 +1,3 @@
 SV_PORT = 8080
-SV_ROOT = "/var/xen/sv/"
-PID_FILE = "/var/xen/sv.pid"
\ No newline at end of file
+SV_ROOT = "/var/lib/xen/sv/"
+PID_FILE = "/var/run/xen-sv.pid"
diff --git a/tools/python/xen/xend/XendRoot.py b/tools/python/xen/xend/XendRoot.py
index c9cc9a2279..dea3eeeb2f 100644
--- a/tools/python/xen/xend/XendRoot.py
+++ b/tools/python/xen/xend/XendRoot.py
@@ -20,7 +20,7 @@ class XendRoot:
     """Root of the management classes."""
 
     """Default path to the root of the database."""
-    dbroot_default = "/var/xen/xend-db"
+    dbroot_default = "/var/lib/xen/xend-db"
 
     """Default path to the config file."""
     config_default = "/etc/xen/xend-config.sxp"
diff --git a/tools/python/xen/xend/server/SrvServer.py b/tools/python/xen/xend/server/SrvServer.py
index 28ddaa7e48..353d6eed24 100644
--- a/tools/python/xen/xend/server/SrvServer.py
+++ b/tools/python/xen/xend/server/SrvServer.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # Copyright (C) 2004 Mike Wray <mike.wray@hp.com>
 
 """Example xend HTTP and console server.
diff --git a/tools/python/xen/xend/sxp.py b/tools/python/xen/xend/sxp.py
index 35b24aa8aa..e2c0de5c5b 100644
--- a/tools/python/xen/xend/sxp.py
+++ b/tools/python/xen/xend/sxp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # Copyright (C) 2004 Mike Wray <mike.wray@hp.com>
 """
 Input-driven parsing for s-expression (sxp) format.
diff --git a/tools/sv/Makefile b/tools/sv/Makefile
index 8ae9a93f87..c2b4e92dfc 100755
--- a/tools/sv/Makefile
+++ b/tools/sv/Makefile
@@ -1,4 +1,7 @@
-sv_insdir := $(prefix)/var/xen/sv
+sv_insdir := /var/lib/xen/sv
+INSTALL		= install
+INSTALL_DIR	= $(INSTALL) -d -m0755
+INSTALL_DATA	= $(INSTALL) -m0644
 
 all:
 
@@ -14,17 +17,16 @@ IMAGES	+= next.png previous.png finish.png
 
 install:
 	# copy XenSV Main.rpy file
-	@mkdir -p $(sv_insdir)
-	@install -m0644 Main.rpy $(sv_insdir)
+	@$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)
+	@$(INSTALL_DATA) Main.rpy $(DESTDIR)$(sv_insdir)
 
 	# copy XenSV images
-	@mkdir -p $(sv_insdir)/images
-	@(cd images && install -m0644 $(IMAGES) $(sv_insdir)/images)
+	@$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/images
+	@(cd images && $(INSTALL_DATA) $(IMAGES) $(DESTDIR)$(sv_insdir)/images)
 
 	# copy XenSV stylesheet
-	@mkdir -p $(sv_insdir)/inc
-	@install -m0644 inc/style.css $(sv_insdir)/inc
-	@install -m0644 inc/script.js $(sv_insdir)/inc
+	@$(INSTALL_DIR) $(DESTDIR)$(sv_insdir)/inc
+	@$(INSTALL_DATA) inc/style.css inc/script.js $(DESTDIR)$(sv_insdir)/inc
 
 clean:
 
diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index 1b13bd9d8b..9133271b66 100644
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -1,3 +1,7 @@
+INSTALL		= install
+INSTALL_PROG	= $(INSTALL) -m0755
+INSTALL_DIR	= $(INSTALL) -d -m0755
+INSTALL_DATA	= $(INSTALL) -m0644
 
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Make.defs
@@ -20,12 +24,12 @@ MAN8     = $(wildcard *.8)
 all: $(BIN)
 
 install: all
-	mkdir -p $(prefix)/usr/bin
-	mkdir -p $(prefix)/usr/man/man1
-	mkdir -p $(prefix)/usr/man/man8
-	install -m0755 $(BIN) $(SCRIPTS) $(prefix)/usr/bin
-	install -m0644 $(MAN1) $(prefix)/usr/man/man1
-	install -m0644 $(MAN8) $(prefix)/usr/man/man8
+	$(INSTALL_DIR) $(DESTDIR)/usr/bin
+	$(INSTALL_DIR) $(DESTDIR)/usr/man/man1
+	$(INSTALL_DIR) $(DESTDIR)/usr/man/man8
+	$(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
+	$(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/man/man1
+	$(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/man/man8
 
 clean:
 	$(RM) *.a *.so *.o *.rpm $(BIN)
diff --git a/tools/xfrd/Makefile b/tools/xfrd/Makefile
index 2330d829c4..6ca1a1d12f 100644
--- a/tools/xfrd/Makefile
+++ b/tools/xfrd/Makefile
@@ -4,6 +4,10 @@
 # Mike Wray <mike.wray@hp.com>
 #============================================================================
 
+INSTALL		= install
+INSTALL_PROG	= $(INSTALL) -m0755
+INSTALL_DIR	= $(INSTALL) -d -m0755
+
 XEN_ROOT  = ../..
 include $(XEN_ROOT)/tools/Make.defs
 
@@ -68,8 +72,8 @@ xfrd: $(XFRD_PROG_OBJ)
 
 .PHONY: install
 install: xfrd
-	mkdir -p $(prefix)/$(XFRD_INSTALL_DIR)
-	install -m 0755 xfrd $(prefix)/$(XFRD_INSTALL_DIR)
+	$(INSTALL_DIR) $(DESTDIR)/$(XFRD_INSTALL_DIR)
+	$(INSTALL_PROG) xfrd $(DESTDIR)/$(XFRD_INSTALL_DIR)
 
 .PHONY: libutil
 libutil: $(UTIL_LIB)
diff --git a/xen/Makefile b/xen/Makefile
index b151475b1d..1231a7a8d9 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -1,3 +1,6 @@
+INSTALL			= install
+INSTALL_DATA		= $(INSTALL) -m0644
+INSTALL_DIR		= $(INSTALL) -d -m0755
 
 # This is the correct place to edit the build version.
 # All other places this is stored (eg. compile.h) should be autogenerated.
@@ -5,28 +8,29 @@ export XEN_VERSION       = 3
 export XEN_SUBVERSION    = 0
 export XEN_EXTRAVERSION  = "-devel"
 
-export BASEDIR          := $(shell pwd)
+export BASEDIR          := $(CURDIR)
+DESTDIR			:= $(CURDIR)/../dist/install
 
 include Rules.mk
 
-default: $(TARGET)
-	gzip -f -9 < $(TARGET) > $(TARGET).gz
+default: $(TARGET).gz
+$(TARGET).gz: $(TARGET)
+	gzip -f -9 < $< > $@.new
+	mv $@.new $@
 
 debug:	
 	objdump -D -S $(TARGET)-syms > $(TARGET).s
 
-install: $(TARGET)
-	gzip -f -9 < $(TARGET) > $(TARGET).gz
-	mkdir -p $(prefix)/boot
-	install -m0644 $(TARGET).gz $(prefix)/boot
-	install -m0644 $(TARGET)-syms $(prefix)/boot
-	mkdir -p $(prefix)/usr/include/xen/io
-	install -m0644 include/public/*.h $(prefix)/usr/include/xen
-	install -m0644 include/public/io/*.h $(prefix)/usr/include/xen/io
-	install -m0644 include/public/COPYING $(prefix)/usr/include/xen
+install: $(TARGET).gz
+	$(INSTALL_DIR) $(DESTDIR)/boot
+	$(INSTALL_DATA) $(TARGET).gz $(DESTDIR)/boot
+	$(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot
+	$(INSTALL_DIR) $(DESTDIR)/usr/include/xen/io
+	$(INSTALL_DATA) include/public/*.h $(DESTDIR)/usr/include/xen
+	$(INSTALL_DATA) include/public/io/*.h $(DESTDIR)/usr/include/xen/io
+	$(INSTALL_DATA) include/public/COPYING $(DESTDIR)/usr/include/xen
 
-dist: $(TARGET)
-	$(MAKE) prefix=`pwd`/../dist/install dist=yes install
+dist: install
 
 clean:
 	$(MAKE) -C tools clean
@@ -35,11 +39,10 @@ clean:
 	$(MAKE) -C arch/$(TARGET_ARCH) clean
 	rm -f include/asm *.o $(TARGET)* *~ core include/xen/compile.h
 	rm -f include/asm-*/asm-offsets.h
+	rm -f tools/figlet/*.o tools/figlet/figlet
 
-$(TARGET): delete-unfresh-files
+$(TARGET): delete-unfresh-files include/xen/compile.h
 	[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
-	$(MAKE) -C tools
-	$(MAKE) include/xen/compile.h
 	$(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s
 	$(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h
 	$(MAKE) -C common
@@ -51,25 +54,30 @@ delete-unfresh-files:
 	rm -f include/xen/compile.h common/kernel.o
 
 # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
-include/xen/compile.h:
-	@LANG=C echo /\* Autogenerated by root Makefile. Do not edit. \*/ > $@
-	@LANG=C echo >> $@
-	@LANG=C echo \#define XEN_COMPILE_DATE \"`date`\" >> $@
-	@LANG=C echo \#define XEN_COMPILE_TIME \"`date +%T`\" >> $@
-	@LANG=C echo \#define XEN_COMPILE_BY \"`whoami`\" >> $@
-	@LANG=C echo \#define XEN_COMPILE_DOMAIN \"`([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown])`\" >> $@
-	@LANG=C echo \#define XEN_COMPILE_HOST \"`hostname`\" >> $@
-	@LANG=C echo \#define XEN_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -n 1`\" >> $@
-	@LANG=C echo >> $@
-	@LANG=C echo \#define XEN_VERSION\ \ \ \ \ \ $(XEN_VERSION) >> $@
-	@LANG=C echo \#define XEN_SUBVERSION\ \ \ $(XEN_SUBVERSION) >> $@
-	@LANG=C echo \#define XEN_EXTRAVERSION \"$(XEN_EXTRAVERSION)\" >> $@
-	@LANG=C echo >> $@
-	@LANG=C echo \#define XEN_CHANGESET \"`bk changes -nd':D: :T: :REV: :MD5KEY:' -r+ 2>/dev/null || echo "information unavailable"`\" >> $@
-	@LANG=C echo >> $@
-	@LANG=C echo \#define XEN_BANNER \\ >> $@
-	( cd ./tools/figlet && ./figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) 1>>../../$@ )
-	@LANG=C echo >> $@
+include/xen/compile.h: LANG=C
+include/xen/compile.h: include/xen/compile.h.in include/xen/banner.h
+	sed -e 's/@@date@@/$(shell date)/g' \
+	    -e 's/@@time@@/$(shell date +%T)/g' \
+	    -e 's/@@whoami@@/$(shell whoami)/g' \
+	    -e 's/@@domain@@/$(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) || ([ -x /bin/domainname ] && /bin/domainname || echo [unknown]))/g' \
+	    -e 's/@@hostname@@/$(shell hostname)/g' \
+	    -e 's/@@compiler@@/$(shell $(CC) $(CFLAGS) -v 2>&1 | tail -1)/g' \
+	    -e 's/@@version@@/$(XEN_VERSION)/g' \
+	    -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
+	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
+	    -e 's!@@changeset@@!$(shell bk changes -nd':D: :T: :REV: :MD5KEY:' -r+ 2>/dev/null || echo information unavailable)!g' \
+	    < include/xen/compile.h.in > $@.new
+	cat include/xen/banner.h >> $@.new
+	mv $@.new $@
+
+tools/figlet/figlet: tools/figlet/figlet.o
+	$(CC) -o $@ $<
+tools/figlet/figlet.o: tools/figlet/figlet.c
+	$(CC) -o $@ -c $<
+
+include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
+	tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
+	mv $@.new $@
 
 include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
 	@(set -e; \
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 68e857ba48..1b08d7b25d 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -18,12 +18,18 @@ OBJS := $(subst vmx_io.o,,$(OBJS))
 OBJS := $(subst vmx_vmcs.o,,$(OBJS))
 endif
 
-default: boot/$(TARGET_SUBARCH).o $(OBJS) boot/mkelf32
-	$(LD) $(LDFLAGS) -r -o arch.o $(OBJS)
-	$(LD) $(LDFLAGS) -T $(TARGET_SUBARCH)/xen.lds -N \
-	    boot/$(TARGET_SUBARCH).o $(ALL_OBJS) -o $(TARGET)-syms
+default: $(TARGET)
+
+$(TARGET): $(TARGET)-syms boot/mkelf32
 	./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000
 
+$(CURDIR)/arch.o: $(OBJS)
+	$(LD) $(LDFLAGS) -r -o $@ $(OBJS)
+
+$(TARGET)-syms: boot/$(TARGET_SUBARCH).o $(ALL_OBJS) $(TARGET_SUBARCH)/xen.lds
+	$(LD) $(LDFLAGS) -T $(TARGET_SUBARCH)/xen.lds -N \
+	    boot/$(TARGET_SUBARCH).o $(ALL_OBJS) -o $@
+
 asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c
 	$(CC) $(CFLAGS) -S -o $@ $<
 
diff --git a/xen/common/Makefile b/xen/common/Makefile
index e68bccf10c..9e683841a2 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -24,7 +24,8 @@ endif
 OBJS := $(subst sched_atropos.o,,$(OBJS))
 OBJS := $(subst sched_rrobin.o,,$(OBJS))
 
-default: $(OBJS)
+default: common.o
+common.o: $(OBJS)
 	$(LD) $(LDFLAGS) -r -o common.o $(OBJS)
 
 clean:
diff --git a/xen/drivers/acpi/Makefile b/xen/drivers/acpi/Makefile
index 2b80430148..fec92eb405 100644
--- a/xen/drivers/acpi/Makefile
+++ b/xen/drivers/acpi/Makefile
@@ -6,7 +6,8 @@ include $(BASEDIR)/Rules.mk
 
 OBJS := acpi_ksyms.o tables.o
 
-default: $(OBJS)
+default: driver.o
+driver.o: $(OBJS)
 	$(LD) $(LDFLAGS) -r -o driver.o $(OBJS)
 
 clean:
diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index f938f87017..957a4bc5a2 100644
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -1,7 +1,8 @@
 
 include $(BASEDIR)/Rules.mk
 
-default: $(OBJS)
+default: driver.o
+driver.o: $(OBJS)
 	$(LD) $(LDFLAGS) -r -o driver.o $(OBJS)
 
 clean:
diff --git a/xen/drivers/pci/Makefile b/xen/drivers/pci/Makefile
index 7fd6c1705f..040d5aaccd 100644
--- a/xen/drivers/pci/Makefile
+++ b/xen/drivers/pci/Makefile
@@ -28,7 +28,8 @@ OBJS := pci.o quirks.o compat.o names.o setup-res.o
 #obj-y += syscall.o
 #endif
 
-default: $(OBJS)
+default: driver.o
+driver.o: $(OBJS)
 	$(LD) $(LDFLAGS) -r -o driver.o $(OBJS)
 
 clean:
diff --git a/xen/include/xen/banner.h b/xen/include/xen/banner.h
new file mode 100644
index 0000000000..f9d5f90f06
--- /dev/null
+++ b/xen/include/xen/banner.h
@@ -0,0 +1,12 @@
+"\040\137\137\040\040\137\137\040\040\040\040\040\040\040\040\040\040\040" \
+"\040\137\137\137\137\040\040\040\040\137\137\137\040\040\012\040\134\040" \
+"\134\057\040\057\137\137\137\040\137\040\137\137\040\040\040\174\137\137" \
+"\137\040\134\040\040\057\040\137\040\134\040\012\040\040\134\040\040\057" \
+"\057\040\137\040\134\040\047\137\040\134\040\040\040\040\137\137\051\040" \
+"\174\174\040\174\040\174\040\174\012\040\040\057\040\040\134\040\040\137" \
+"\137\057\040\174\040\174\040\174\040\040\057\040\137\137\057\040\174\040" \
+"\174\137\174\040\174\012\040\057\137\057\134\137\134\137\137\137\174\137" \
+"\174\040\174\137\174\040\174\137\137\137\137\137\050\137\051\137\137\137" \
+"\057\040\012\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040" \
+"\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\040\012" \
+
diff --git a/xen/include/xen/compile.h.in b/xen/include/xen/compile.h.in
new file mode 100644
index 0000000000..e5179509fb
--- /dev/null
+++ b/xen/include/xen/compile.h.in
@@ -0,0 +1,13 @@
+#define XEN_COMPILE_DATE	"@@date@@"
+#define XEN_COMPILE_TIME	"@@time@@"
+#define XEN_COMPILE_BY		"@@whoami@@"
+#define XEN_COMPILE_DOMAIN	"@@domain@@"
+#define XEN_COMPILE_HOST	"@@hostname@@"
+#define XEN_COMPILER		"@@compiler@@"
+
+#define XEN_VERSION		@@version@@
+#define XEN_SUBVERSION		@@subversion@@
+#define XEN_EXTRAVERSION	@@extraversion@@
+
+#define XEN_CHANGESET		"@@changeset@@"
+#define XEN_BANNER		\