diff --git a/tools/chibi-genstatic b/tools/chibi-genstatic
index 511abda5..6aed6b07 100755
--- a/tools/chibi-genstatic
+++ b/tools/chibi-genstatic
@@ -393,13 +393,15 @@
            (includes #f)
            (excludes '())
            (cfiles '())
-           (inline? #f))
+           (inline? #t))
     (cond
      ((and (pair? args) (not (equal? "" (car args)))
            (eqv? #\- (string-ref (car args) 0)))
       (case (string->symbol (car args))
         ((--inline)
          (lp (cdr args) features includes excludes cfiles #t))
+        ((--no-inline)
+         (lp (cdr args) features includes excludes cfiles #f))
         ((--features)
          (if (null? (cdr args))
              (error "--features requires an argument"))
@@ -425,8 +427,7 @@
           (set! *features* features))
       (let* ((c-libs+c-files (find-c-libs includes excludes cfiles))
              (c-libs (car c-libs+c-files))
-             (c-files (cdr c-libs+c-files))
-             (inline? #t))
+             (c-files (cdr c-libs+c-files)))
         (display "#include \"chibi/eval.h\"\n")
         (newline)
         (for-each (lambda (x) (include-c-lib x c-files inline?)) c-libs)