diff --git a/build.xml b/build.xml
index ecdaf34da..e78a99509 100644
--- a/build.xml
+++ b/build.xml
@@ -309,6 +309,18 @@
     <include name="${ant.package}/types/AbstractFileSetTest*"/>
   </patternset>
 
+  <!--
+       ===================================================================
+         Set up a patternsets that matches the parts of our site that
+         should not be part of the distribution.
+       ===================================================================
+  -->
+  <patternset id="site.excludes">
+    <exclude name="bindownload.html"/>
+    <exclude name="srcdownload.html"/>
+    <exclude name="*.cgi"/>
+  </patternset>
+
   <!--
        ===================================================================
          Check to see what optional dependencies are available
@@ -1025,12 +1037,16 @@
     <copy todir="${dist.lib}" file="${lib.dir}/README"/>
 
     <copy todir="${dist.docs}">
-      <fileset dir="${docs.dir}" excludes="${unfiltered.files}"/>
+      <fileset dir="${docs.dir}" excludes="${unfiltered.files}">
+        <patternset refid="site.excludes"/>
+      </fileset>
       <filterchain refid="ant.filters"/>
     </copy>
 
     <copy todir="${dist.docs}" filtering="false">
-      <fileset dir="${docs.dir}" includes="${unfiltered.files}"/>
+      <fileset dir="${docs.dir}" includes="${unfiltered.files}">
+        <patternset refid="site.excludes"/>
+      </fileset>
     </copy>
 
     <copy todir="${dist.dir}">
@@ -1120,6 +1136,7 @@
     <copy todir="${src.dist.docs}">
       <fileset dir="${docs.dir}">
         <exclude name="manual/api/**"/>
+        <patternset refid="site.excludes"/>
       </fileset>
     </copy>