diff --git a/Makefile b/Makefile
index 1d43044033..d959cd5b47 100644
--- a/Makefile
+++ b/Makefile
@@ -291,11 +291,6 @@ help:
 	@echo '  uninstall             - attempt to remove installed Xen tools'
 	@echo '                          (use with extreme care!)'
 	@echo
-	@echo 'Trusted Boot (tboot) targets:'
-	@echo '  build-tboot           - download and build the tboot module'
-	@echo '  install-tboot         - download, build, and install the tboot module'
-	@echo '  clean-tboot           - clean the tboot module if it exists'
-	@echo
 	@echo 'Package targets:'
 	@echo '  src-tarball-release   - make a source tarball with xen and qemu tagged with a release'
 	@echo '  src-tarball           - make a source tarball with xen and qemu tagged with git describe'
@@ -324,46 +319,7 @@ uninstall-docs:
 .PHONY: uninstall
 uninstall: D=$(DESTDIR)
 uninstall: uninstall-tools-public-headers $(TARGS_UNINSTALL)
-	rm -rf $(D)/boot/tboot*
 
 .PHONY: xenversion
 xenversion:
 	@$(MAKE) --no-print-directory -C xen xenversion
-
-#
-# tboot targets
-#
-
-TBOOT_TARFILE = tboot-20090330.tar.gz
-#TBOOT_BASE_URL = http://downloads.sourceforge.net/tboot
-TBOOT_BASE_URL = $(XEN_EXTFILES_URL)
-
-.PHONY: build-tboot
-build-tboot: download_tboot
-	$(MAKE) -C tboot build
-
-.PHONY: install-tboot
-install-tboot: download_tboot
-	$(MAKE) -C tboot install
-
-.PHONY: dist-tboot
-dist-tboot: download_tboot
-	$(MAKE) DESTDIR=$(DISTDIR)/install -C tboot dist
-
-.PHONY: clean-tboot
-clean-tboot:
-	[ ! -d tboot ] || $(MAKE) -C tboot clean
-
-.PHONY: distclean-tboot
-distclean-tboot:
-	[ ! -d tboot ] || $(MAKE) -C tboot distclean
-
-.PHONY: download_tboot
-download_tboot: tboot/Makefile
-
-tboot/Makefile: tboot/$(TBOOT_TARFILE)
-	[ -e tboot/Makefile ] || tar -xzf tboot/$(TBOOT_TARFILE) -C tboot/ --strip-components 1
-
-tboot/$(TBOOT_TARFILE):
-	mkdir -p tboot
-	wget -O tboot/$(TBOOT_TARFILE) $(TBOOT_BASE_URL)/$(TBOOT_TARFILE)
diff --git a/README b/README
index 4b95b21c7b..3a497fb064 100644
--- a/README
+++ b/README
@@ -199,8 +199,3 @@ http://sourceforge.net/projects/tboot.  This project hosts the code in a
 mercurial repo at http://tboot.sourceforge.net/hg/tboot.hg and contains
 tarballs of the source.  Instructions in the tboot README describe how
 to modify grub.conf to use tboot to launch Xen.
-
-There are optional targets as part of Xen's top-level makefile that will
-download and build tboot: install-tboot, build-tboot, dist-tboot, clean-tboot.
-These will download the latest tar file from the SourceForge site using wget,
-then build/install/dist according to Xen's settings.