diff --git a/bugs.php b/bugs.php
new file mode 100644
index 0000000..de83264
--- /dev/null
+++ b/bugs.php
@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+    <title>SWT Eclipse Bugzilla</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
+    <link rel="stylesheet" href="swt.css" type="text/css">
+    <link rel="shortcut icon" href="http://www.eclipse.org/images/eclipse.ico" type="image/x-icon">
+    <style type="text/css"> dt { padding-top: 20px; padding-bottom: 5px; } </style>
+</head>
+<body bgcolor="#ffffff" text="#000000">
+<table width="825px" class="swtpage">
+<colgroup><col width="125px"><col width="700px"></colgroup>
+<tr><?php include "sidebar.php"; ?>
+<td valign="top" style="padding: 10px">
+<h1 style="padding: 0; margin: 0; border-bottom: 1px solid #000000;">SWT Eclipse Bugzilla</h1>
+
+<p>SWT bug reports are stored in the <a href="http://bugs.eclipse.org/bugs/">Eclipse Bugzilla database</a>.
+Here are some useful links:</p>
+
+<h4><a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Platform&component=SWT">
+	Open a new SWT bug report</a></h4>
+
+<h4><a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Platform&component=SWT&bug_severity=enhancement">
+	Request an SWT Feature</a></h4>
+
+<h4>
+<form action="https://bugs.eclipse.org/bugs/buglist.cgi" method="get">
+Find an open SWT bug report containing: 
+<input type="text" name="long_desc" />
+<input type="submit" value="Search" />
+<input type="hidden" name="order" value="Bug Number" />
+<input type="hidden" name="bug_status" value="__open__" />
+<input type="hidden" name="classification" value="Eclipse" />
+<input type="hidden" name="product" value="Platform" />
+<input type="hidden" name="component" value="SWT" />
+<input type="hidden" name="long_desc_type" value="allwordssubstr" />
+</form>
+</h4>
+
+<h4>
+<form action="https://bugs.eclipse.org/bugs/buglist.cgi" method="get">
+Find any SWT bug report containing: 
+<input type="text" name="long_desc" />
+<input type="submit" value="Search" />
+<input type="hidden" name="order" value="Bug Number" />
+<input type="hidden" name="classification" value="Eclipse" />
+<input type="hidden" name="product" value="Platform" />
+<input type="hidden" name="component" value="SWT" />
+<input type="hidden" name="long_desc_type" value="allwordssubstr" />
+</form>
+</h4>
+
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/index.php b/index.php
index 9652b0b..7f0a12f 100755
--- a/index.php
+++ b/index.php
@@ -107,7 +107,7 @@
 <li><a href="examples.php">Examples</a>, helpful big code examples</li>
 <li><a href="faq.php">The SWT FAQ</a> answers many common questions</li>
 <li><a href="tools.php">Tools and Plug-ins</a> for SWT developers</li>
-<li><a href="http://help.eclipse.org/help31/nftopic/org.eclipse.platform.doc.isv/reference/api/overview-summary.html">Online Javadoc</a></li>
+<li><a href="http://help.eclipse.org/help33/nftopic/org.eclipse.platform.doc.isv/reference/api/overview-summary.html">Online Javadoc</a></li>
 <li><a href="docs.php">Books and additional documentation</a></li>
 <li><a href="test_plan.html">Test Plan for SWT</a></li>
 <li><a href="community.php">SWT Community Page</a></li>
diff --git a/sidebar.php b/sidebar.php
index 3104ffe..9fbb2e2 100755
--- a/sidebar.php
+++ b/sidebar.php
@@ -7,7 +7,7 @@
 <tr><td class="nav">&nbsp; <a class="nav" href="http://help.eclipse.org/stable/nftopic/org.eclipse.platform.doc.isv/reference/api/overview-summary.html">API Javadoc</a>
 <tr><td class="nav">&nbsp; <a class="nav" href="http://www.eclipse.org/swt/docs.php">Documentation</a>
 <tr><td class="nav">&nbsp; <a class="nav" href="http://www.eclipse.org/swt/community.php">Community</a>
-<tr><td class="nav">&nbsp; <a class="nav" href="http://bugs.eclipse.org/bugs/">Bugs</a>
+<tr><td class="nav">&nbsp; <a class="nav" href="http://www.eclipse.org/swt/bugs.php">Bugs</a>
 <tr><td class="nav">&nbsp; <a class="nav" href="http://www.eclipse.org/swt/">SWT Home</a>
 </table><p></p><table class="nav" width="100%">
 <tr><td class="nav">&nbsp; <a class="nav" href="http://www.eclipse.org/platform/">Eclipse Platform</a>