diff --git a/webtools/bugzilla/makecomponenttable.sh b/webtools/bugzilla/makecomponenttable.sh
index 1a8f85cd721..4cef54e00ca 100755
--- a/webtools/bugzilla/makecomponenttable.sh
+++ b/webtools/bugzilla/makecomponenttable.sh
@@ -118,6 +118,9 @@ insert into components (value, program, initialowner) values ("Viewer App", "NGL
 insert into components (value, program, initialowner) values ("Widget Set", "NGLayout", "kmcclusk@netscape.com");
 insert into components (value, program, initialowner) values ("XPCOM", "NGLayout", "scullin@netscape.com");
 
+insert into components (value, program, initialowner) values ("Bonsai", "Webtools", "terry@mozilla.org");
+insert into components (value, program, initialowner) values ("Bugzilla", "Webtools", "terry@mozilla.org");
+insert into components (value, program, initialowner) values ("Tinderbox", "Webtools", "terry@mozilla.org");
 
 
 select * from components;
diff --git a/webtools/bugzilla/makeproducttable.sh b/webtools/bugzilla/makeproducttable.sh
index f23a701408f..5e478134d68 100755
--- a/webtools/bugzilla/makeproducttable.sh
+++ b/webtools/bugzilla/makeproducttable.sh
@@ -29,10 +29,12 @@ mysql << OK_ALL_DONE
 use bugs;
 create table products (
 product tinytext,
-description tinytext
+description mediumtext
 );
 
 
-insert into products (product, description) values ("Bugzilla", "Use this to describe a problem you're having with the bug system itself");
+insert into products (product, description) values ("Bugzilla", "Please don't use this!  This product is going away very very soon. Please use 'Webtools' instead.");
 insert into products (product, description) values ("Mozilla", "For bugs about the Mozilla web browser");
 insert into products (product, description) values ("NGLayout", 'For bugs about the <a href="http://www.mozilla.org/newlayout/">New Layout</a> project');
+insert into products (product, description) values ("Webtools", 'For bugs about the web-based tools that mozilla.org uses.  This include Bugzilla (problems you are having with this bug system itself), <a href="http://www.mozilla.org/bonsai.html">Bonsai</a>, and <a href="http://www.mozilla.org/tinderbox.html">Tinderbox</a>.');
+
diff --git a/webtools/bugzilla/makeversiontable.sh b/webtools/bugzilla/makeversiontable.sh
index 2e86547791b..98e0b52b8a8 100755
--- a/webtools/bugzilla/makeversiontable.sh
+++ b/webtools/bugzilla/makeversiontable.sh
@@ -44,6 +44,7 @@ insert into versions (value, program) values ("1998-09-04", "Mozilla");
 insert into versions (value, program) values ("1.0", "Bugzilla");
 insert into versions (value, program) values ("other", "Bugzilla");
 insert into versions (value, program) values ("other", "NGLayout");
+insert into versions (value, program) values ("other", "Webtools");
 
 select * from versions;