diff --git a/collects/scribblings/draw/draw.scrbl b/collects/scribblings/draw/draw.scrbl
index 247cc879ae..0d7bc3c38f 100644
--- a/collects/scribblings/draw/draw.scrbl
+++ b/collects/scribblings/draw/draw.scrbl
@@ -11,13 +11,11 @@
 @racketmodname[racket/draw] library provides all of the class,
 interface, and procedure bindings defined in this manual.}
 
-For an overview of the drawing library, see @secref["draw" #:doc
-'(lib "scribblings/guide/guide.scrbl")].
-
 @table-of-contents[]
 
 @;------------------------------------------------------------------------
 
+@include-section["guide.scrbl"]
 @include-section["bitmap-class.scrbl"]
 @include-section["bitmap-dc-class.scrbl"]
 @include-section["brush-class.scrbl"]
diff --git a/collects/scribblings/guide/fire.png b/collects/scribblings/draw/fire.png
similarity index 100%
rename from collects/scribblings/guide/fire.png
rename to collects/scribblings/draw/fire.png
diff --git a/collects/scribblings/guide/draw.scrbl b/collects/scribblings/draw/guide.scrbl
similarity index 99%
rename from collects/scribblings/guide/draw.scrbl
rename to collects/scribblings/draw/guide.scrbl
index 5b4ebc268f..3b01bfc70b 100644
--- a/collects/scribblings/guide/draw.scrbl
+++ b/collects/scribblings/draw/guide.scrbl
@@ -1,12 +1,10 @@
 #lang scribble/doc
 @(require scribble/manual
-          "guide-utils.ss"
+          "common.ss"
           scribble/eval
           scribble/racket
           (for-syntax racket/base)
-          (for-label racket/draw
-                     racket/math
-                     racket/gui))
+          (for-label racket/math))
 
 @(define draw-eval (make-base-eval))
 @interaction-eval[#:eval draw-eval (require racket/class
@@ -74,14 +72,15 @@
 @(define-linked-method rotate dc<%>)
 @(define-linked-method set-path region%)
 
-@title[#:tag "draw"]{Drawing}
+@title[#:tag "overview"]{Overview}
 
 The @racketmodname[racket/draw] library provides a drawing API that is
 based on the PostScript drawing model. It supports line drawing, shape
 filling, bitmap copying, alpha blending, and affine transformations
 (i.e., scale, rotation, and translation).
 
-@guideother{See @secref["classes"] for an introduction to classes and
+@margin-note{See @secref["classes" #:doc '(lib
+"scribblings/guide/guide.scrbl")] for an introduction to classes and
 interfaces in Racket.}
 
 Drawing with @racketmodname[racket/draw] requires a @deftech{drawing context}
diff --git a/collects/scribblings/guide/water.png b/collects/scribblings/draw/water.png
similarity index 100%
rename from collects/scribblings/guide/water.png
rename to collects/scribblings/draw/water.png
diff --git a/collects/scribblings/guide/graphics.scrbl b/collects/scribblings/guide/graphics.scrbl
index 5c82988000..e65a1cc8bd 100644
--- a/collects/scribblings/guide/graphics.scrbl
+++ b/collects/scribblings/guide/graphics.scrbl
@@ -2,7 +2,7 @@
 @(require scribble/manual
           "guide-utils.ss")
 
-@title[#:tag "graphics" #:style 'toc]{Graphics and GUIs}
+@title[#:tag "graphics"]{Graphics and GUIs}
 
 Racket provides many libraries for graphics and graphical user
 interfaces (GUIs):
@@ -10,15 +10,19 @@ interfaces (GUIs):
 @itemlist[
 
  @item{The @racketmodname[racket/draw] library provides basic drawing
-       tools, including @tech{drawing contexts} such as bitmaps and
+       tools, including drawing contexts such as bitmaps and
        PostScript files.
 
-       See @secref["draw"] for an overview.}
+       See @other-doc['(lib "scribblings/draw/draw.scrbl")]
+       for more information.}
 
  @item{The @racketmodname[racket/gui] library provides GUI widgets
        such as windows, buttons, checkboxes, and text fields. The
        library also includes a sophisticated and extensible text
-       editor.}
+       editor.
+
+       See @other-doc['(lib "scribblings/gui/gui.scrbl")]
+       for more information.}
 
  @item{The @racketmodname[slideshow/pict] library provides a more
        functional abstraction layer over @racketmodname[racket/draw].
@@ -29,7 +33,7 @@ interfaces (GUIs):
        "scribblings/scribble/scribble.scrbl") "top"]{Scribble}
        documents or other drawing tasks. Pictures created with the
        @racketmodname[slideshow/pict] library can be rendered to any
-       @tech{drawing context}.
+       drawing context.
 
        See @other-doc['(lib "scribblings/slideshow/slideshow.scrbl")]
        for more information.}
@@ -49,5 +53,3 @@ interfaces (GUIs):
        information.}
 
 ]
-
-@include-section["draw.scrbl"]
diff --git a/collects/scribblings/guide/guide.scrbl b/collects/scribblings/guide/guide.scrbl
index 37091df6a8..3403354234 100644
--- a/collects/scribblings/guide/guide.scrbl
+++ b/collects/scribblings/guide/guide.scrbl
@@ -52,8 +52,6 @@ precise details to @|Racket| and other reference manuals.
 
 @include-section["languages.scrbl"]
 
-@include-section["graphics.scrbl"]
-
 @include-section["performance.scrbl"]
 
 @include-section["running.scrbl"]
diff --git a/collects/scribblings/guide/other.scrbl b/collects/scribblings/guide/other.scrbl
index 8db3c32999..70802e7cac 100644
--- a/collects/scribblings/guide/other.scrbl
+++ b/collects/scribblings/guide/other.scrbl
@@ -4,14 +4,26 @@
 
 @title{More Libraries}
 
-@other-manual['(lib "scribblings/foreign/foreign.scrbl")] describes
-tools for using Racket to access libraries that are normally used by C
-programs.
+This guide covers only the Racket language and libraries that are
+documented in @|Racket|. The Racket distribution includes many
+additional libraries.
+
+@include-section["graphics.scrbl"]
+
+@section{The Web Server}
 
 @other-manual['(lib "web-server/scribblings/web-server.scrbl")]
 describes the Racket web server, which supports servlets implemented
 in Racket.
 
+@section{Using Foreign Libraries}
+
+@other-manual['(lib "scribblings/foreign/foreign.scrbl")] describes
+tools for using Racket to access libraries that are normally used by C
+programs.
+
+@section{And More}
+
 @link["../index.html"]{Racket Documentation} lists documentation for
 many other installed libraries. Run @exec{raco docs} to find
 documentation for libraries that are installed on your system and