diff --git a/collects/meta/pkg-index/basic/main.rkt b/collects/meta/pkg-index/basic/main.rkt
index 6d8177a3a6..8b759b7861 100644
--- a/collects/meta/pkg-index/basic/main.rkt
+++ b/collects/meta/pkg-index/basic/main.rkt
@@ -40,7 +40,7 @@
      [() list-pkgs]
      [("") list-pkgs]
      [("pkgs") write-pkgs]
-     [("pkgs" "all") write-pkgs/all]
+     [("pkgs-all") write-pkgs/all]
      [("pkg" (string-arg) "display") display-info]
      [("pkg" (string-arg)) write-info]))
   dispatch)
diff --git a/collects/meta/pkg-index/planet-compat/main.rkt b/collects/meta/pkg-index/planet-compat/main.rkt
index d509eba41c..6745ab982a 100644
--- a/collects/meta/pkg-index/planet-compat/main.rkt
+++ b/collects/meta/pkg-index/planet-compat/main.rkt
@@ -384,7 +384,7 @@
                          pkg-depo-dir pkg-name)
                  'url
                  (let ()
-                   (match-define (regexp #rx"^planet-([^-]+)-([^0-9]+)[0-9]+"
+                   (match-define (regexp #rx"^planet-([^-]+)-(.+)[0-9]+$"
                                          (list _ user pkg))
                                  pkg-name)
                    (format "http://planet.racket-lang.org/display.ss?package=~a.plt&owner=~a"