diff --git a/_build/update_site.sh b/_build/update_site.sh
index f97dd718..358729ed 100755
--- a/_build/update_site.sh
+++ b/_build/update_site.sh
@@ -11,8 +11,10 @@ BUNDLE_DIR='/bitcoin.org/bundle'
 SITEDIR='/bitcoin.org/site'
 DESTDIR='build@bitcoinorgsite:/var/www/site'
 WORKDIR=`mktemp -d`
+BITCOINORG_BUILD_TYPE='deployment'
 
 export BUNDLE_DIR
+export BITCOINORG_BUILD_TYPE
 
 # Stop script in case a single command fails
 set -e
diff --git a/_templates/about-us.html b/_templates/about-us.html
index 82dd1b5a..d580fe39 100644
--- a/_templates/about-us.html
+++ b/_templates/about-us.html
@@ -5,6 +5,7 @@
 layout: base
 id: about-us
 ---
+{% if site.env.BITCOINORG_BUILD_TYPE %}
 <!-- Note: this file is built non-deterministically -->
 <h1>{% translate pagetitle %}</h1>
 <p class="summary">{% translate pagedesc %}</p>
@@ -83,3 +84,19 @@ id: about-us
   </div>
   {% endfor %}
 </div>
+{% else %}
+{% comment %}
+<!-- if you've cloned bitcoin.org, feel free to fill in your own About
+Us below. It would be appreciated it if you link back to Bitcoin.org,
+but please make it clear that your site is not affiliated with
+Bitcoin.org.
+
+It would also be appreciated if you would remove our names and email
+addresses from the README.md file in the top-level directory.  -->
+{% endcomment %}
+<h1>About this site</h1>
+
+This site includes content originally published on <a
+href="https://bitcoin.org">Bitcoin.org</a>, but it is not affiliated with
+Bitcoin.org.
+{% endif %}
diff --git a/_templates/download.html b/_templates/download.html
index 7a9bfa5b..2612de86 100755
--- a/_templates/download.html
+++ b/_templates/download.html
@@ -16,6 +16,7 @@ lin32: "linux32.tar.gz"
 lin64: "linux64.tar.gz"
 
 ---
+{% if site.env.BITCOINORG_BUILD_TYPE %}
 <!-- Note: this file exempt from check-for-subheading-anchors check -->
 
 {% capture PATH_PREFIX %}/bin/bitcoin-core-{{ site.DOWNLOAD_VERSION }}{% endcapture %}
@@ -148,3 +149,13 @@ case 'mac':
 break;
 }
 </script>
+{% else %}
+{% capture redirect %}https://bitcoin.org/{{page.lang}}/{% translate download url %}{% endcapture %}
+<meta name="robots" content="noindex">
+<script>window.location.href='{{ redirect }}';</script>
+
+<div class="redirectmsg">
+<h1>This page has been moved</h1>
+<p><a href="{{ redirect }}">{{ redirect }}</a></p>
+</div>
+{% endif %}