diff --git a/collects/meta/web/config.rkt b/collects/meta/web/config.rkt
index 8abdd7c8d5..e27931b21e 100644
--- a/collects/meta/web/config.rkt
+++ b/collects/meta/web/config.rkt
@@ -5,6 +5,7 @@
   '(("www"           "http://racket-lang.org/")
     ("download"      "http://download.racket-lang.org/")
     ("lists"         "http://lists.racket-lang.org/")
+    ("bugs"          "http://bugs.racket-lang.org/")
     ;; stubs usually use absolute paths for resources, since they're
     ;; templates that often get used in sub-dir pages too
     ("stubs/planet"  "http://planet.racket-lang.org/"   abs)
diff --git a/collects/meta/web/minis/bugs-captcha1.jpg b/collects/meta/web/minis/bugs-captcha1.jpg
new file mode 100644
index 0000000000..25ba50c07e
Binary files /dev/null and b/collects/meta/web/minis/bugs-captcha1.jpg differ
diff --git a/collects/meta/web/minis/bugs-captcha2.jpg b/collects/meta/web/minis/bugs-captcha2.jpg
new file mode 100644
index 0000000000..cc01c12b79
Binary files /dev/null and b/collects/meta/web/minis/bugs-captcha2.jpg differ
diff --git a/collects/meta/web/minis/bugs-captcha3.jpg b/collects/meta/web/minis/bugs-captcha3.jpg
new file mode 100644
index 0000000000..dcfd30a399
Binary files /dev/null and b/collects/meta/web/minis/bugs-captcha3.jpg differ
diff --git a/collects/meta/web/minis/bugs.rkt b/collects/meta/web/minis/bugs.rkt
new file mode 100644
index 0000000000..2b884f60b4
--- /dev/null
+++ b/collects/meta/web/minis/bugs.rkt
@@ -0,0 +1,25 @@
+#lang at-exp s-exp "../common.rkt"
+
+(define-context "bugs")
+
+(define planet-bugs "http://planet.racket-lang.org/trac/newticket")
+
+(require "../www/main.rkt")
+
+(define query
+  @page[#:title "Query Bug Reports" #:file "query/"]{
+    @em{TODO}})
+
+(define index
+  @page[#:title "Bug Reports"]{
+    @p[style: "padding: 5px; color: #a00; border: 1px solid;"]{@em{
+         If you can, please use the Bug Report item in DrRacket's Help menu. It
+         works better than this page, because it helps you supply precise
+         information about your Racket installation and working environment.}}
+    @p{@strong{Note:} Bug reports for PLaneT packages are submitted on the
+       @a[href: planet-bugs]{PLaneT server}.}
+    @p{Before submitting a bug report, you may wish to:
+       @ul{@li{Consult the @-docs,}
+           @li{@download a newer Racket version if there is one (Racket
+               displays its version number on startup),}
+           @li{@query{Query existing bug reports}.}}}})
diff --git a/collects/meta/web/minis/main.rkt b/collects/meta/web/minis/main.rkt
index 4791b4e8ab..53bde7ef66 100644
--- a/collects/meta/web/minis/main.rkt
+++ b/collects/meta/web/minis/main.rkt
@@ -1,3 +1,3 @@
 #lang at-exp s-exp "../common.rkt"
 
-(require "lists.rkt")
+(require "lists.rkt" "bugs.rkt")