diff --git a/textarchive/mp3tags.pl b/textarchive/mp3tags.pl
index 06922a9e213752a52e4d26edf0532dd4e05be44d..d7ba1dfacd029ae62d5339a5cc269e5a1facb435 100755
--- a/textarchive/mp3tags.pl
+++ b/textarchive/mp3tags.pl
@@ -7,15 +7,15 @@ use Data::Dumper;
 $Data::Dumper::Indent= 1;
 
 my $op_mode;
-my $doit= 0;
+my $do_move= 0;
 
 my @PAR;
 while (my $arg= shift (@ARGV))
 {
   if ($arg =~ /^-/)
   {
-    if ($arg eq '--mv-album') { $op_mode= 'mv_album'; }
-    elsif ($arg eq '--doit') { $doit= 1; }
+    if ($arg eq '--album') { $op_mode= 'album'; }
+    elsif ($arg eq '--move') { $do_move= 1; }
     else
     {
       &usage;
@@ -32,26 +32,28 @@ foreach my $file (@PAR)
 {
   my $tag= get_mp3tag ($file);
 
-  print "file: [$file]\n";
-  print "tag: ", Dumper ($tag);
-
-  if ($op_mode eq 'mv_album')
+  if ($op_mode eq 'album')
   {
-    my $album= $tag->{'ALBUM'};
+    my $album= $tag->{'ALBUM'} || 'unknown album';
     push (@{$albums{$album}}, $file);
   }
+  else
+  {
+    print "file: [$file]\n";
+    print "tag: ", Dumper ($tag);
+  }
 }
 
-  if ($op_mode eq 'mv_album')
+  if ($op_mode eq 'album')
   {
     foreach my $album (sort keys %albums)
     {
       print "album=[$album]\n";
-      system ('mkdir', $album) if ($doit);
+      system ('mkdir', $album) if ($do_move);
       foreach my $file (@{$albums{$album}})
       {
         print "file=[$file]\n";
-        system ('mv', '-i', $file, $album) if ($doit);
+        system ('mv', '-i', $file, $album) if ($do_move);
       }
     }
   }