diff --git a/collects/mzlib/private/contract-define.rkt b/collects/mzlib/private/contract-define.rkt
index faad09a30a..416a91a0ab 100644
--- a/collects/mzlib/private/contract-define.rkt
+++ b/collects/mzlib/private/contract-define.rkt
@@ -3,7 +3,7 @@
 (provide define/contract)
 
 (require (for-syntax racket/base
-                     unstable/srcloc
+                     syntax/srcloc
                      (prefix-in a: racket/contract/private/helpers))
          (only-in racket/contract/private/base contract))
 
diff --git a/collects/mzlib/unit.rkt b/collects/mzlib/unit.rkt
index 22b3c67d4a..0f93d85edd 100644
--- a/collects/mzlib/unit.rkt
+++ b/collects/mzlib/unit.rkt
@@ -10,7 +10,7 @@
                      syntax/struct
                      scheme/struct-info
                      syntax/stx
-                     unstable/location
+                     syntax/location
                      "private/unit-contract-syntax.rkt"
                      "private/unit-compiletime.rkt"
                      "private/unit-syntax.rkt"))
@@ -18,7 +18,7 @@
 (require mzlib/etc
          racket/contract/base
          scheme/stxparam
-         unstable/location
+         syntax/location
          "private/unit-contract.rkt"
          "private/unit-keywords.rkt"
          "private/unit-runtime.rkt"
diff --git a/collects/racket/contract/private/arr-i.rkt b/collects/racket/contract/private/arr-i.rkt
index 884c4d2558..57fecbe8e5 100644
--- a/collects/racket/contract/private/arr-i.rkt
+++ b/collects/racket/contract/private/arr-i.rkt
@@ -5,7 +5,7 @@
          "guts.rkt"
          "opt.rkt"
          "blame.rkt"
-         unstable/location
+         syntax/location
          (for-syntax racket/base
                      racket/stxparam-exptime
                      "arr-i-parse.rkt"
diff --git a/collects/racket/contract/private/base.rkt b/collects/racket/contract/private/base.rkt
index 1a32f3ae43..0b65a61e86 100644
--- a/collects/racket/contract/private/base.rkt
+++ b/collects/racket/contract/private/base.rkt
@@ -15,8 +15,8 @@ improve method arity mismatch contract violation error messages?
 
 (require (for-syntax racket/base syntax/name)
          racket/stxparam
-         unstable/srcloc
-         unstable/location
+         syntax/srcloc
+         syntax/location
          "guts.rkt"
          "blame.rkt"
          "prop.rkt"
diff --git a/collects/racket/contract/private/blame.rkt b/collects/racket/contract/private/blame.rkt
index 583fcede5b..a3a3e8fc2f 100644
--- a/collects/racket/contract/private/blame.rkt
+++ b/collects/racket/contract/private/blame.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require unstable/srcloc racket/pretty)
+(require syntax/srcloc racket/pretty)
 
 (provide blame?
          make-blame
diff --git a/collects/racket/contract/private/legacy.rkt b/collects/racket/contract/private/legacy.rkt
index 0aa7a45a31..89b4a8a417 100644
--- a/collects/racket/contract/private/legacy.rkt
+++ b/collects/racket/contract/private/legacy.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require "guts.rkt" "blame.rkt" "prop.rkt" unstable/srcloc)
+(require "guts.rkt" "blame.rkt" "prop.rkt" syntax/srcloc)
 
 (provide make-proj-contract
          raise-contract-error
diff --git a/collects/racket/contract/private/provide.rkt b/collects/racket/contract/private/provide.rkt
index 10f287b394..46b46ff410 100644
--- a/collects/racket/contract/private/provide.rkt
+++ b/collects/racket/contract/private/provide.rkt
@@ -12,8 +12,8 @@
          racket/contract/exists
          "guts.rkt"
          (for-syntax unstable/dirs)
-         unstable/location
-         unstable/srcloc)
+         syntax/location
+         syntax/srcloc)
 
 (define-syntax (verify-contract stx)
   (syntax-case stx ()
diff --git a/collects/racket/contract/regions.rkt b/collects/racket/contract/regions.rkt
index 7376919c86..bbf6f84fce 100644
--- a/collects/racket/contract/regions.rkt
+++ b/collects/racket/contract/regions.rkt
@@ -14,7 +14,7 @@
                      (prefix-in a: "private/helpers.rkt"))
          racket/splicing
          racket/stxparam
-         unstable/location
+         syntax/location
          "private/arrow.rkt"
          "private/base.rkt"
          "private/guts.rkt")
diff --git a/collects/unstable/location.rkt b/collects/syntax/location.rkt
similarity index 97%
rename from collects/unstable/location.rkt
rename to collects/syntax/location.rkt
index 4dcb6616d8..f79db55f75 100644
--- a/collects/unstable/location.rkt
+++ b/collects/syntax/location.rkt
@@ -1,10 +1,8 @@
 #lang racket/base
-
-(require unstable/srcloc
+(require syntax/srcloc
          (for-syntax racket/base
-                     unstable/srcloc
+                     syntax/srcloc
                      unstable/dirs))
-
 (provide quote-srcloc
          quote-source-file
          quote-line-number
diff --git a/collects/syntax/parse/experimental/provide.rkt b/collects/syntax/parse/experimental/provide.rkt
index b8ece258e8..98c261af96 100644
--- a/collects/syntax/parse/experimental/provide.rkt
+++ b/collects/syntax/parse/experimental/provide.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/contract/base
-         unstable/location
+         syntax/location
          (for-syntax racket/base
                      racket/syntax
                      "../private/minimatch.rkt"
diff --git a/collects/unstable/scribblings/srcloc.scrbl b/collects/syntax/scribblings/srcloc.scrbl
similarity index 96%
rename from collects/unstable/scribblings/srcloc.scrbl
rename to collects/syntax/scribblings/srcloc.scrbl
index bfcc51d5ab..61e7bddb5d 100644
--- a/collects/unstable/scribblings/srcloc.scrbl
+++ b/collects/syntax/scribblings/srcloc.scrbl
@@ -1,13 +1,16 @@
 #lang scribble/manual
-@(require scribble/eval "utils.rkt" (for-label racket/base unstable/srcloc unstable/location))
+@(require scribble/eval
+          (for-label racket/base 
+                     syntax/srcloc
+                     syntax/location))
 
 @(define unsyntax #f)
 
 @(define (new-evaluator)
    (let* ([e (make-base-eval)])
      (e '(require (for-syntax racket/base)
-                  unstable/srcloc
-                  unstable/location))
+                  syntax/srcloc
+                  syntax/location))
      e))
 
 @(define evaluator (new-evaluator))
@@ -17,15 +20,15 @@
 
 @title{Source Locations}
 
+@author[@author+email["Carl Eastlund" "cce@ccs.neu.edu"]]
+
 There are two libraries in this collection for dealing with source locations;
 one for manipulating representations of them, and the other for quoting the
 location of a particular piece of source code.
 
 @section[#:tag "srcloc"]{Representations}
 
-@defmodule[unstable/srcloc]
-
-@unstable[@author+email["Carl Eastlund" "cce@ccs.neu.edu"]]
+@defmodule[syntax/srcloc]
 
 This module defines utilities for manipulating representations of source
 locations, including both @racket[srcloc] structures and all the values accepted
@@ -216,9 +219,7 @@ The first produces a string describing the source location; the second appends
 
 @section[#:tag "location"]{Quoting}
 
-@defmodule[unstable/location]
-
-@unstable[@author+email["Carl Eastlund" "cce@ccs.neu.edu"]]
+@defmodule[syntax/location]
 
 This module defines macros that evaluate to various aspects of their own source
 location.
@@ -304,7 +305,7 @@ programmatically, such as via @racket[dynamic-require].
 
 @defexamples[#:eval (new-evaluator)
 (module A racket
-  (require unstable/location)
+  (require syntax/location)
   (define-syntax-rule (name) (quote-module-name))
   (define-syntax-rule (path) (quote-module-path))
   (define a-name (name))
@@ -314,7 +315,7 @@ programmatically, such as via @racket[dynamic-require].
 a-name
 a-path
 (module B racket
-  (require unstable/location)
+  (require syntax/location)
   (require 'A)
   (define b-name (name))
   (define b-path (path))
diff --git a/collects/syntax/scribblings/syntax.scrbl b/collects/syntax/scribblings/syntax.scrbl
index d8ce83e7af..5376840feb 100644
--- a/collects/syntax/scribblings/syntax.scrbl
+++ b/collects/syntax/scribblings/syntax.scrbl
@@ -22,4 +22,6 @@
 
 @include-section["parse.scrbl"]
 
+@include-section["srcloc.scrbl"]
+
 @index-section[]
diff --git a/collects/unstable/srcloc.rkt b/collects/syntax/srcloc.rkt
similarity index 99%
rename from collects/unstable/srcloc.rkt
rename to collects/syntax/srcloc.rkt
index d83f887caa..c81c099b77 100644
--- a/collects/unstable/srcloc.rkt
+++ b/collects/syntax/srcloc.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-;; Unstable library by: Carl Eastlund <cce@ccs.neu.edu>
+;; Library by: Carl Eastlund <cce@ccs.neu.edu>
 ;; intended for use in racket/contract, so don't try to add contracts!
 
 (provide
diff --git a/collects/typed-scheme/typecheck/tc-toplevel.rkt b/collects/typed-scheme/typecheck/tc-toplevel.rkt
index 2ca752a191..1e9cc7623e 100644
--- a/collects/typed-scheme/typecheck/tc-toplevel.rkt
+++ b/collects/typed-scheme/typecheck/tc-toplevel.rkt
@@ -22,7 +22,7 @@
          racket/dict         
          (for-template
           "internal-forms.rkt"
-          unstable/location
+          syntax/location
           mzlib/contract
           scheme/base))
 
diff --git a/collects/typed-scheme/utils/require-contract.rkt b/collects/typed-scheme/utils/require-contract.rkt
index 3e8b43d55a..8524848515 100644
--- a/collects/typed-scheme/utils/require-contract.rkt
+++ b/collects/typed-scheme/utils/require-contract.rkt
@@ -1,7 +1,7 @@
 #lang scheme/base
 
 (require scheme/contract
-         unstable/location
+         syntax/location
          (for-syntax scheme/base
                      syntax/parse                     
                      (prefix-in tr: "../private/typed-renaming.rkt")))
diff --git a/collects/unstable/debug.rkt b/collects/unstable/debug.rkt
index 689dea83c3..ef5615fb94 100644
--- a/collects/unstable/debug.rkt
+++ b/collects/unstable/debug.rkt
@@ -22,8 +22,8 @@
 (require racket/block
          racket/match
          unstable/pretty
-         unstable/srcloc
-         unstable/location
+         syntax/srcloc
+         syntax/location
          racket/syntax
          (for-syntax racket/base racket/match syntax/parse racket/syntax))
 
diff --git a/collects/unstable/port.rkt b/collects/unstable/port.rkt
index 87ef299e5b..5cc0f53553 100644
--- a/collects/unstable/port.rkt
+++ b/collects/unstable/port.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/match
          racket/contract
-         unstable/srcloc)
+         syntax/srcloc)
 
 #|
 Ryan:
diff --git a/collects/unstable/scribblings/unstable.scrbl b/collects/unstable/scribblings/unstable.scrbl
index 800383df14..a223d3fe71 100644
--- a/collects/unstable/scribblings/unstable.scrbl
+++ b/collects/unstable/scribblings/unstable.scrbl
@@ -90,7 +90,6 @@ Keep documentation and tests up to date.
 @include-section["sandbox.scrbl"]
 @include-section["set.scrbl"]
 @include-section["sexp-diff.scrbl"]
-@include-section["srcloc.scrbl"]
 @include-section["string.scrbl"]
 @include-section["struct.scrbl"]
 @include-section["syntax.scrbl"]
diff --git a/collects/unstable/scribblings/wrapc.scrbl b/collects/unstable/scribblings/wrapc.scrbl
index 8ee2ad3bd0..b8e656948a 100644
--- a/collects/unstable/scribblings/wrapc.scrbl
+++ b/collects/unstable/scribblings/wrapc.scrbl
@@ -6,7 +6,7 @@
           (for-label racket/base
                      racket/contract
                      unstable/wrapc
-                     unstable/syntax))
+                     racket/syntax))
 
 @(begin
   (define the-eval (make-base-eval))
@@ -66,7 +66,7 @@ is an identifier) or the @scheme[context] argument, and the module
 where it is @emph{defined} is used as the negative blame location. If
 neither an identifier @scheme[macro-name] nor a @scheme[context]
 argument is given, the location is @scheme["unknown"].}
-@item{If the argument is @scheme['same-as-use-site], the module being
+@item{If the argument is @scheme['use-site], the module being
 expanded is used.}
 @item{If the argument is @scheme['unknown], the blame label is
 @scheme["unknown"].}
diff --git a/collects/unstable/wrapc.rkt b/collects/unstable/wrapc.rkt
index 1130b0fdd5..e80c88f235 100644
--- a/collects/unstable/wrapc.rkt
+++ b/collects/unstable/wrapc.rkt
@@ -2,8 +2,8 @@
 (require racket/contract/base
          (for-template racket/base
                        racket/contract/base
-                       unstable/location)
-         unstable/srcloc
+                       syntax/location)
+         syntax/srcloc
          racket/syntax)
 
 (provide/contract
@@ -12,7 +12,7 @@
        (#:positive (or/c syntax? string? module-path-index?
                          'from-macro 'use-site 'unknown)
         #:negative (or/c syntax? string? module-path-index?
-                         'from-macro 'same-as-use-site 'unknown)
+                         'from-macro 'use-site 'unknown)
         #:name (or/c identifier? symbol? string? #f)
         #:macro (or/c identifier? symbol? string? #f)
         #:context (or/c syntax? #f))
@@ -76,7 +76,7 @@
                 (cond [(string? source) source]
                       [(syntax? source) (source-location->string source)]
                       [(module-path-index? source)
-                       ;; FIXME: share with unstable/location ??
+                       ;; FIXME: share with syntax/location ??
                        (let ([name (resolved-module-path-name
                                     (module-path-index-resolve source))])
                          (cond [(path? name) (format "(file ~s)" (path->string name))]