--- cvsroot/App-Staticperl/mkbundle	2011/02/10 09:30:56	1.20
+++ cvsroot/App-Staticperl/mkbundle	2011/02/10 22:44:29	1.24
@@ -85,7 +85,7 @@
          if (/use (.*)$/) {
             my $mod = $1;
             my $pkg = ++$pkg;
-            my $eval = $mod = $mod =~ /[^A-Za-z0-9_:]/
+            my $eval = $mod =~ /[^A-Za-z0-9_:]/
                        ? "require $mod"
                        : "{ package $pkg; use $mod; }";
             eval $eval;
@@ -272,11 +272,11 @@
 }
 
 sub cmd_add {
-   $_[0] =~ /^(.*)(?:\s+(\S+))?$/
+   $_[0] =~ /^(.*?)(?:\s+(\S+))?$/
       or die "$_[0]: cannot parse";
 
    my $file = $1;
-   my $as   = defined $2 ? $2 : "&$1";
+   my $as   = defined $2 ? $2 : $1;
 
    $pm{$as} = $file;
    $pmbin{$as} = 1 if $_[1];