diff --git a/collects/meta/planet2-index/official/main.rkt b/collects/meta/planet2-index/official/main.rkt
index f083dc1532..1b14ac2b26 100644
--- a/collects/meta/planet2-index/official/main.rkt
+++ b/collects/meta/planet2-index/official/main.rkt
@@ -322,7 +322,7 @@
          empty empty
          (list "Someone tried to register your email address for an account on Planet2. If you want to authorize this registration and log in, please click the following link:"
                ""
-               (format "https://pnr.plt-etc.byu.edu~a" k-url)
+               (format "https://pnr.racket-lang.org~a" k-url)
                ""
                "This link will expire, so if it is not available, you'll have to try to register again."))
         (template
diff --git a/collects/meta/planet2-index/planet-compat/main.rkt b/collects/meta/planet2-index/planet-compat/main.rkt
index 10c045b9d3..ece2ec34d2 100644
--- a/collects/meta/planet2-index/planet-compat/main.rkt
+++ b/collects/meta/planet2-index/planet-compat/main.rkt
@@ -380,8 +380,8 @@
                  (file->string
                   (build-path pkg-depo pkg-depo-dir (format "~a.plt.CHECKSUM" pkg-name)))
                  'source
-                 (format "https://plt-etc.byu.edu:~a/~a/~a.plt"
-                         port pkg-depo-dir pkg-name)
+                 (format "https://planet-compat.racket-lang.org/~a/~a.plt"
+                         pkg-depo-dir pkg-name)
                  'url
                  (let ()
                    (match-define (regexp #rx"^planet-([^-]+)-([^0-9]+)[0-9]+"
diff --git a/collects/planet2/lib.rkt b/collects/planet2/lib.rkt
index 2075e1dc86..5352c83947 100644
--- a/collects/planet2/lib.rkt
+++ b/collects/planet2/lib.rkt
@@ -207,8 +207,8 @@
             (λ ()
               (match k
                 ["indexes"
-                 (list "https://pnr.plt-etc.byu.edu"
-                       "https://planet-compat.plt-etc.byu.edu")]))))
+                 (list "https://pnr.racket-lang.org"
+                       "https://planet-compat.racket-lang.org")]))))
 
 (define (package-index-lookup pkg)
   (or
diff --git a/collects/planet2/scribblings/planet2.scrbl b/collects/planet2/scribblings/planet2.scrbl
index f38ed6b916..2512bf0315 100644
--- a/collects/planet2/scribblings/planet2.scrbl
+++ b/collects/planet2/scribblings/planet2.scrbl
@@ -192,8 +192,8 @@ the @tech{package source} string and @racket['checksum] mapped to the
 @racket['source] will be a remote URL.
 
 PLT supports two @tech{package name resolvers} that are enabled by
-default: @url{https://pnr.plt-etc.byu.edu} for new
-packages and @url{https://planet-compat.plt-etc.byu.edu} for
+default: @url{https://pnr.racket-lang.org} for new
+packages and @url{https://planet-compat.racket-lang.org} for
 automatically generated packages for old @|PLaneT|
 packages. Anyone may host their own @tech{package name resolver}. The
 source for the PLT-hosted resolvers is in the
@@ -507,7 +507,7 @@ it by a simple name until it is listed on a @tech{package name resolver}.
 
 If you'd like to use the official @tech{package name resolver}, browse
 to
-@link["https://pnr.plt-etc.byu.edu/manage/upload"]{https://pnr.plt-etc.byu.edu/manage/upload}
+@link["https://pnr.racket-lang.org/manage/upload"]{https://pnr.racket-lang.org/manage/upload}
 and upload a new package. You will need to create an account and log
 in first.
 
@@ -635,7 +635,7 @@ PLT maintains a @tech{package name resolver} to serve packages that
 were developed using the original @seclink[#:doc '(lib
 "planet/planet.scrbl") "top"]{@|Planet1|} package system.  This
 compatibility resolver is at
-@link["https://plt-etc.byu.edu:9003/"]{https://plt-etc.byu.edu:9003/},
+@link["https://planet-compat.racket-lang.org/"]{https://planet-compat.racket-lang.org/},
 which is included by default in the package-server search path.
 
 Copies of @|Planet1| packages are automatically created by the
diff --git a/collects/tests/planet2/tests-config.rkt b/collects/tests/planet2/tests-config.rkt
index 8b8bfee565..1830bf7b8b 100644
--- a/collects/tests/planet2/tests-config.rkt
+++ b/collects/tests/planet2/tests-config.rkt
@@ -6,6 +6,6 @@
  (with-fake-root
   (shelly-case
    "reading and writing configs"
-   $ "raco pkg config indexes" =stdout> "https://pnr.plt-etc.byu.edu\nhttps://planet-compat.plt-etc.byu.edu\n"
+   $ "raco pkg config indexes" =stdout> "https://pnr.racket-lang.org\nhttps://planet-compat.racket-lang.org\n"
    $ "raco pkg config --set indexes http://localhost:9000"
    $ "raco pkg config indexes" =stdout> "http://localhost:9000\n")))