diff --git a/collects/racket/private/reqprov.rkt b/collects/racket/private/reqprov.rkt
index 8566dea94b..bff57cf5c7 100644
--- a/collects/racket/private/reqprov.rkt
+++ b/collects/racket/private/reqprov.rkt
@@ -40,13 +40,25 @@
                  [(file . _) 'file]
                  [(submod . _) 'submod])]
               [d (syntax->datum stx)])
-          (if (eq? (car d) kw)
-              stx
-              (datum->syntax
-               stx
-               (cons kw (cdr d))
-               stx
-               stx)))
+          (cond
+           [(eq? kw 'submod)
+            (syntax-case stx ()
+              [(_ mp . rest)
+               (let ([new-mp (xlate-path #'mp)])
+                 (if (and (eq? new-mp #'mp)
+                          (eq? (car d) 'submod))
+                     stx
+                     (datum->syntax
+                      stx
+                      (list* kw new-mp #'rest)
+                      stx
+                      stx)))])]
+           [(eq? (car d) kw) stx]
+           [else (datum->syntax
+                  stx
+                  (cons kw (cdr d))
+                  stx
+                  stx)]))
         stx))
   
   (define-for-syntax (check-lib-form stx)
@@ -59,7 +71,8 @@
   (define-syntaxes (lib file planet submod)
     (let ([t (lambda (stx)
                (check-lib-form stx)
-               (let* ([mod-path (syntax->datum stx)]
+               (let* ([stx (xlate-path stx)]
+                      [mod-path (syntax->datum stx)]
                       [namess (syntax-local-module-exports stx)])
                  (values
                   (apply
diff --git a/collects/tests/racket/module.rktl b/collects/tests/racket/module.rktl
index 69d3ddec1b..90d3be1210 100644
--- a/collects/tests/racket/module.rktl
+++ b/collects/tests/racket/module.rktl
@@ -595,7 +595,8 @@
   (map 
    eval
    '((module service racket
-       (#%module-begin))
+       (#%module-begin
+        (module s racket/base)))
      
      (module good-client racket
        (#%module-begin
@@ -615,7 +616,24 @@
          (rename-in racket/base
                     [quote dynamic-in]))
         (require
-         (rename-in (dynamic-in service))))))))
+         (rename-in (dynamic-in service)))))
+     
+     (module submodule-good-client racket
+       (#%module-begin
+        (require
+         (rename-in racket/base
+                    [quote dynamic-in]))
+        (require
+         (rename-in (submod (dynamic-in service) s)))))
+     
+     (module another-submodule-good-client racket
+       (#%module-begin
+        (require
+         (rename-in racket/base
+                    [quote dynamic-in]
+                    [submod alt:submod]))
+        (require
+         (rename-in (alt:submod (dynamic-in service) s))))))))
 
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Check phase-1 syntax used via for-template