diff --git a/archive.html b/archive.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_YXJjaGl2ZS5odG1s..47fbcae75874f99956953724acd0db634001b1f5_YXJjaGl2ZS5odG1s 100644
--- a/archive.html
+++ b/archive.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/compat.html b/compat.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_Y29tcGF0Lmh0bWw=..47fbcae75874f99956953724acd0db634001b1f5_Y29tcGF0Lmh0bWw= 100644
--- a/compat.html
+++ b/compat.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/contact.html b/contact.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_Y29udGFjdC5odG1s..47fbcae75874f99956953724acd0db634001b1f5_Y29udGFjdC5odG1s 100644
--- a/contact.html
+++ b/contact.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
@@ -75,7 +71,7 @@
 <li>irc: <strong>#pypy</strong> on <strong>irc.freenode.net</strong></li>
 <li>mailing list: <a class="reference external" href="http://mail.python.org/mailman/listinfo/pypy-dev">pypy-dev at python.org</a></li>
 <li>for security related issues, non-public funding enquiries etc. please contact <a class="reference external" href="mailto:pypy&#64;sfconservancy.org">pypy&#64;sfconservancy.org</a></li>
-<li>the <a class="reference external" href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">bug tracker</a></li>
+<li>the bitbucket <a class="reference external" href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">bug tracker</a> (registration required to open new issues or to comment)</li>
 <li>more on our <a class="reference external" href="http://doc.pypy.org">dev site</a>.</li>
 <li>code on <a class="reference external" href="https://bitbucket.org/pypy/pypy/overview">bitbucket</a>.</li>
 </ul>
diff --git a/download.html b/download.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_ZG93bmxvYWQuaHRtbA==..47fbcae75874f99956953724acd0db634001b1f5_ZG93bmxvYWQuaHRtbA== 100644
--- a/download.html
+++ b/download.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/features.html b/features.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_ZmVhdHVyZXMuaHRtbA==..47fbcae75874f99956953724acd0db634001b1f5_ZmVhdHVyZXMuaHRtbA== 100644
--- a/features.html
+++ b/features.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/howtohelp.html b/howtohelp.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_aG93dG9oZWxwLmh0bWw=..47fbcae75874f99956953724acd0db634001b1f5_aG93dG9oZWxwLmh0bWw= 100644
--- a/howtohelp.html
+++ b/howtohelp.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/index.html b/index.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_aW5kZXguaHRtbA==..47fbcae75874f99956953724acd0db634001b1f5_aW5kZXguaHRtbA== 100644
--- a/index.html
+++ b/index.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/numpydonate.html b/numpydonate.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_bnVtcHlkb25hdGUuaHRtbA==..47fbcae75874f99956953724acd0db634001b1f5_bnVtcHlkb25hdGUuaHRtbA== 100644
--- a/numpydonate.html
+++ b/numpydonate.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/people.html b/people.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_cGVvcGxlLmh0bWw=..47fbcae75874f99956953724acd0db634001b1f5_cGVvcGxlLmh0bWw= 100644
--- a/people.html
+++ b/people.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/performance.html b/performance.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_cGVyZm9ybWFuY2UuaHRtbA==..47fbcae75874f99956953724acd0db634001b1f5_cGVyZm9ybWFuY2UuaHRtbA== 100644
--- a/performance.html
+++ b/performance.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/py3donate.html b/py3donate.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_cHkzZG9uYXRlLmh0bWw=..47fbcae75874f99956953724acd0db634001b1f5_cHkzZG9uYXRlLmh0bWw= 100644
--- a/py3donate.html
+++ b/py3donate.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/source/_layouts/site.genshi b/source/_layouts/site.genshi
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_c291cmNlL19sYXlvdXRzL3NpdGUuZ2Vuc2hp..47fbcae75874f99956953724acd0db634001b1f5_c291cmNlL19sYXlvdXRzL3NpdGUuZ2Vuc2hp 100644
--- a/source/_layouts/site.genshi
+++ b/source/_layouts/site.genshi
@@ -11,7 +11,6 @@
       ('Performance', 'performance.html'),
       ('Dev Documentation', 'http://doc.pypy.org'),
       ('Blog', 'http://morepypy.blogspot.com'),
-      ('Bug/Issues', 'https://bitbucket.org/pypy/pypy/issues?status=new&status=open'),
       ('People', 'people.html'),
       ('Contact', 'contact.html'),
       ('Py3k donations', 'py3donate.html'),
@@ -15,7 +14,6 @@
       ('People', 'people.html'),
       ('Contact', 'contact.html'),
       ('Py3k donations', 'py3donate.html'),
-      ('NumPy donations', 'numpydonate.html'),
       ('STM donations', 'tmdonate2.html'),
       ],
     }
diff --git a/source/contact.txt b/source/contact.txt
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_c291cmNlL2NvbnRhY3QudHh0..47fbcae75874f99956953724acd0db634001b1f5_c291cmNlL2NvbnRhY3QudHh0 100644
--- a/source/contact.txt
+++ b/source/contact.txt
@@ -10,5 +10,5 @@
 
 * mailing list: `pypy-dev at python.org`__
 
-* for security related issues, non-public funding enquiries etc. please contact pypy@sfconservancy.org 
+* for security related issues, non-public funding enquiries etc. please contact pypy@sfconservancy.org
 
@@ -14,5 +14,5 @@
 
-* the `bug tracker`_
+* the bitbucket `bug tracker`_ (registration required to open new issues or to comment)
 
 * more on our `dev site`_.
 
diff --git a/sponsor.html b/sponsor.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_c3BvbnNvci5odG1s..47fbcae75874f99956953724acd0db634001b1f5_c3BvbnNvci5odG1s 100644
--- a/sponsor.html
+++ b/sponsor.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/success.html b/success.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_c3VjY2Vzcy5odG1s..47fbcae75874f99956953724acd0db634001b1f5_c3VjY2Vzcy5odG1s 100644
--- a/success.html
+++ b/success.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/tmdonate.html b/tmdonate.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_dG1kb25hdGUuaHRtbA==..47fbcae75874f99956953724acd0db634001b1f5_dG1kb25hdGUuaHRtbA== 100644
--- a/tmdonate.html
+++ b/tmdonate.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />
diff --git a/tmdonate2.html b/tmdonate2.html
index 97b16db806afb7cc98b1e62b1e3a0c2ae1475498_dG1kb25hdGUyLmh0bWw=..47fbcae75874f99956953724acd0db634001b1f5_dG1kb25hdGUyLmh0bWw= 100644
--- a/tmdonate2.html
+++ b/tmdonate2.html
@@ -53,11 +53,9 @@
         <span class="menu-sub-sep"> | </span>
       <a href="http://morepypy.blogspot.com">Blog</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="https://bitbucket.org/pypy/pypy/issues?status=new&amp;status=open">Bug/Issues</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
@@ -58,11 +56,9 @@
       <a href="people.html">People</a>
         <span class="menu-sub-sep"> | </span>
       <a href="contact.html">Contact</a>
         <br />
       <a href="py3donate.html">Py3k donations</a>
         <span class="menu-sub-sep"> | </span>
-      <a href="numpydonate.html">NumPy donations</a>
-        <span class="menu-sub-sep"> | </span>
       <a href="tmdonate2.html">STM donations</a>
     </div>
 	<hr class="clear" />