diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor
index dfd22a579b..9518fbd8a2 100644
--- a/basis/bootstrap/image/image.factor
+++ b/basis/bootstrap/image/image.factor
@@ -1,15 +1,15 @@
 ! Copyright (C) 2004, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs byte-arrays classes classes.builtin
-classes.private classes.tuple classes.tuple.private combinators
-combinators.short-circuit combinators.smart
-compiler.codegen.relocation compiler.units fry generic
-generic.single.private grouping hashtables hashtables.private io
-io.binary io.encodings.binary io.files io.pathnames kernel
-kernel.private layouts locals make math math.order namespaces
-namespaces.private parser parser.notes prettyprint quotations
-sequences sequences.private source-files strings system vectors
-vocabs words ;
+USING: accessors arrays assocs byte-arrays classes
+classes.builtin classes.private classes.tuple
+classes.tuple.private combinators combinators.short-circuit
+combinators.smart command-line compiler.codegen.relocation
+compiler.units fry generic generic.single.private grouping
+hashtables hashtables.private io io.binary io.encodings.binary
+io.files io.pathnames kernel kernel.private layouts locals make
+math math.order namespaces namespaces.private parser
+parser.notes prettyprint quotations sequences sequences.private
+source-files strings system vectors vocabs words ;
 IN: bootstrap.image
 
 : arch-name ( os cpu -- arch )
@@ -541,4 +541,7 @@ PRIVATE>
 : make-my-image ( -- )
     my-arch-name make-image ;
 
-MAIN: make-my-image
+: make-image-main ( -- )
+    command-line get [ make-my-image ] [ [ make-image ] each ] if-empty ;
+
+MAIN: make-image-main