Index: r7rs-compile-time.scm
===================================================================
--- r7rs-compile-time.scm       (revision 29420)
+++ r7rs-compile-time.scm       (working copy)
@@ -95,7 +95,7 @@
         ;; What R7RS calls IMPORT, we call USE (it imports *and* loads code)
          ;; XXX TODO: Should be import-for-syntax'ed as well?
         `(##core#require-extension
-          ,(map (lambda (s) (fixup-import/export-spec s 'import)) specs)
+          ,(map (lambda (s) (fixup-import/export-spec s 'import)) (cons '(chicken) specs))
           #t))
        (define (process-includes fnames ci?)
         `(##core#begin
@@ -135,7 +135,7 @@
              ,(parse-decls more)))
           ((('begin code ...) . more)
            `(##core#begin
-             (##core#begin ,@code)
+             (##core#begin ,@code (register-feature! ',real-name))
              ,(parse-decls more)))
           (decl (syntax-error 'define-library "invalid library declaration" decl))))
        `(##core#module ,real-name ((,dummy-export))