diff -r eabe86afc6ee .hgignore
--- a/.hgignore	Tue Aug 28 21:01:35 2012 +1000
+++ b/.hgignore	Wed Sep 05 22:08:21 2012 +0200
@@ -42,5 +42,6 @@
 locale/*.bak
 locale/*.poedit
 website/www/_tmp/
+website/www/COPYING.txt
 website/www/docs
 website/www/html/
diff -r eabe86afc6ee CHANGES.txt
--- a/CHANGES.txt	Tue Aug 28 21:01:35 2012 +1000
+++ b/CHANGES.txt	Wed Sep 05 22:08:21 2012 +0200
@@ -37,6 +37,11 @@
   thanks Nathan Russell. (John Kristensen)
 - issue2550756: Fix `oder' typo in mailer.Mailer.bounce_message docstring,
   thanks W. Trevor King (John Kristensen)
+- Update website/www/Makefile to symlink COPYING.txt so "make" works again
+  (Kai Storbeck)
+- Include doc/conf.py in the release tarball, so people can build
+  their own documentation in html. (Kai Storbeck)
+- Update the README.txt on how to create the html docs (Kai Storbeck)
 
 
 2012-05-15: 1.4.20
diff -r eabe86afc6ee MANIFEST.in
--- a/MANIFEST.in	Tue Aug 28 21:01:35 2012 +1000
+++ b/MANIFEST.in	Wed Sep 05 22:08:21 2012 +0200
@@ -8,7 +8,7 @@
 recursive-include detectors *.py
 recursive-include templates *.* home* page*
 global-exclude .svn .cvsignore *.pyc *.pyo .DS_Store
-include run_tests.py *.txt demo.py MANIFEST.in MANIFEST
+include run_tests.py *.txt demo.py MANIFEST.in MANIFEST doc/conf.py
 exclude BUILD.txt I18N_PROGRESS.txt TODO.txt
 exclude doc/security.txt doc/templating.txt
 include locale/*.po locale/*.mo locale/roundup.pot
diff -r eabe86afc6ee README.txt
--- a/README.txt	Tue Aug 28 21:01:35 2012 +1000
+++ b/README.txt	Wed Sep 05 22:08:21 2012 +0200
@@ -37,8 +37,9 @@
 ===========================
 See the index.txt file in the "doc" directory.
 The *.txt files in the "doc" directory are written in reStructedText. If
-you have rst2html installed (part of the docutils suite) you can convert
-these to HTML by running "make html" in the "doc" directory.
+you have Sphinx installed, you can convert these to HTML by running
+  $ python setup.py build_doc
+from the top of the release directory.
 
 
 For Developers
diff -r eabe86afc6ee doc/Makefile
--- a/doc/Makefile	Tue Aug 28 21:01:35 2012 +1000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-STXTOHTML = rst2html.py
-WEBDIR = ../../htdocs/htdocs/doc-1.0
-
-SOURCE = announcement.txt customizing.txt developers.txt FAQ.txt features.txt \
-    glossary.txt implementation.txt index.txt design.txt mysql.txt \
-    installation.txt upgrading.txt user_guide.txt admin_guide.txt \
-	postgresql.txt tracker_templates.txt xmlrpc.txt
-
-COMPILED := $(SOURCE:.txt=.html)
-WEBHT := $(SOURCE:.txt=.ht)
-
-all: html
-html: ${COMPILED}
-
-website: ${WEBHT}
-	cp *.ht ${WEBDIR}
-	cp -r images ${WEBDIR}
-
-%.html: %.txt
-	${STXTOHTML} --report=warning -d $< $@
-
-clean:
-	rm -f ${COMPILED}
diff -r eabe86afc6ee website/www/Makefile
--- a/website/www/Makefile	Tue Aug 28 21:01:35 2012 +1000
+++ b/website/www/Makefile	Wed Sep 05 22:08:21 2012 +0200
@@ -9,10 +9,11 @@
 	@echo "  linkcheck to check all external links for integrity"
 
 clean:
-	-rm -rf $(TMP)
+	-rm -rf $(TMP) docs COPYING.txt
 
 docs:
 	ln -s ../../doc ./docs
+	ln -s ../../COPYING.txt
 
 html: docs
 	mkdir -p $(TMP)/doctrees $(HTML)