diff --git a/mozilla/webtools/bugzilla/editproducts.cgi b/mozilla/webtools/bugzilla/editproducts.cgi
index 59ff7bdece5..5f6c32614ce 100755
--- a/mozilla/webtools/bugzilla/editproducts.cgi
+++ b/mozilla/webtools/bugzilla/editproducts.cgi
@@ -24,6 +24,7 @@
 #               Joe Robins <jmrobins@tgix.com>
 #               Gavin Shelley <bugzilla@chimpychompy.org>
 #               Frédéric Buclin <LpSolit@gmail.com>
+#               Greg Hendricks <ghendricks@novell.com>
 #
 # Direct any questions on this source code to
 #
@@ -614,6 +615,10 @@ if ($action eq 'new') {
     unlink "$datadir/versioncache";
 
     print "OK, done.<p>\n";
+    print "<div style='border: 1px red solid; padding: 1ex;'><b>You will need to    
+           <a href=\"editcomponents.cgi?action=add&product=" .
+           url_quote($product) . "\">add at least one 
+           component</a> before you can enter bugs against this product.</b></div>";
     PutTrailer($localtrailer,
         "<a href=\"editproducts.cgi?action=add\">add</a> a new product",
         "<a href=\"editcomponents.cgi?action=add&product=" .