diff --git a/.gitignore b/.gitignore
index 7207b493b922211780d552c8ffdba0db65f87167..b80b43bc2618da7879f9680490005a3c6ca7fe90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@
 /doc/html
 /doc/install-quick.rst
 /doc/news.rst
+/doc/upgrade.rst
 /doc/*.in
 /doc/*.png
 
diff --git a/Makefile.am b/Makefile.am
index 68998fd30734659c79bbc74a2be770661dbd0a85..f394187c03d3ac18fcc52f4807ec8d5071333a67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,6 +79,7 @@ MAINTAINERCLEANFILES = \
 	$(maninput) \
 	doc/install-quick.rst \
 	doc/news.rst \
+	doc/upgrade.rst \
 	vcs-version
 
 maintainer-clean-local:
@@ -261,6 +262,14 @@ doc/install-quick.rst: INSTALL
 	  cat $<; \
 	} > $@
 
+doc/upgrade.rst: UPGRADE
+	set -e; \
+	{ echo '.. This file is automatically updated at build time from $<.'; \
+	  echo '.. Do not edit.'; \
+	  echo; \
+	  cat $<; \
+	} > $@
+
 docdot = \
 	doc/arch-2.0.dot \
 	doc/design-2.1-lock-acquire.dot \
@@ -331,6 +340,7 @@ pkglib_SCRIPTS = \
 
 EXTRA_DIST = \
 	NEWS \
+	UPGRADE \
 	pylintrc \
 	autotools/build-bash-completion \
 	autotools/check-python-code \
diff --git a/doc/upgrade.rst b/UPGRADE
similarity index 100%
rename from doc/upgrade.rst
rename to UPGRADE