diff --git a/apps/plugins/lib/button_helper.pl b/apps/plugins/lib/button_helper.pl
index 2772357d63..3dbadc2b67 100755
--- a/apps/plugins/lib/button_helper.pl
+++ b/apps/plugins/lib/button_helper.pl
@@ -20,7 +20,7 @@
 #expects -dM -E source input on STDIN
 use strict;
 use warnings;
-my $svnrev = '$Revision$';
+my $svnrev = '';
 my @buttons = ();
 my $count = 1; #null sentinel
 my $val;
@@ -50,7 +50,7 @@ while(my $line = <STDIN>)
 my @sorted = sort { @$a{'value'} <=> @$b{'value'} } @buttons;
 print <<EOF
 /* Don't change this file! */
-/* It is automatically generated of button.h */
+/* It is automatically generated of button.h ($svnrev) */
 #include "plugin.h"
 #include "button.h"
 #include "button_helper.h"
diff --git a/apps/plugins/lua/action_helper.pl b/apps/plugins/lua/action_helper.pl
index 91c86f74b6..5dde7ea733 100755
--- a/apps/plugins/lua/action_helper.pl
+++ b/apps/plugins/lua/action_helper.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/env perl
 ############################################################################
-#             __________               __   ___.                  
-#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___  
-#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /  
-#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
-#                     \/            \/     \/    \/            \/ 
+#                     \/            \/     \/    \/            \/
 #
 # Copyright (C) 2009 by Maurus Cuelenaere
 #
@@ -17,6 +17,8 @@
 #
 ############################################################################
 
+my $svnrev = '';
+
 $i = 0;
 $j = 0;
 while(my $line = <STDIN>)
@@ -41,7 +43,7 @@ while(my $line = <STDIN>)
 }
 
 print "-- Don't change this file!\n";
-printf "-- It is automatically generated of action.h %s\n", '$Revision$';
+printf "-- It is automatically generated of action.h (%s)\n", $svnrev;
 
 print "rb.actions = {\n";
 foreach $action(@actions)
diff --git a/apps/plugins/lua/button_helper.pl b/apps/plugins/lua/button_helper.pl
index 2b7a7c8062..bd2c024555 100755
--- a/apps/plugins/lua/button_helper.pl
+++ b/apps/plugins/lua/button_helper.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/env perl
 ############################################################################
-#             __________               __   ___.                  
-#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___  
-#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /  
-#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
-#                     \/            \/     \/    \/            \/ 
+#                     \/            \/     \/    \/            \/
 #
 # Copyright (C) 2009 by Maurus Cuelenaere
 #
@@ -17,7 +17,7 @@
 #
 ############################################################################
 
-$svnrev = '$Revision$';
+$svnrev = '';
 
 print <<EOF
 #include <stdio.h>
diff --git a/apps/plugins/lua/rocklib_aux.pl b/apps/plugins/lua/rocklib_aux.pl
index fb4a85de5d..972c9e4ec8 100755
--- a/apps/plugins/lua/rocklib_aux.pl
+++ b/apps/plugins/lua/rocklib_aux.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/env perl
 ############################################################################
-#             __________               __   ___.                  
-#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___  
-#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /  
-#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
-#                     \/            \/     \/    \/            \/ 
+#                     \/            \/     \/    \/            \/
 #
 # Copyright (C) 2009 by Maurus Cuelenaere
 #
@@ -36,7 +36,7 @@ sub rand_string
 {
     my @chars=('a'..'z');
     my $ret;
-    foreach (1..5) 
+    foreach (1..5)
     {
         $ret .= $chars[rand @chars];
     }
@@ -179,7 +179,7 @@ while(<STDIN>)
     }
 }
 
-my $svnrev = '$Revision$';
+my $svnrev = '';
 
 # Print the header
 print <<EOF
@@ -389,7 +389,7 @@ foreach my $function (@sorted_functions)
         {
             $func_args .= ", ".$arguments[$i]{'name'};
         }
-        
+
         # Print the function call
         my $func = sprintf("rb->%s(%s)", @$function{'name'}, $func_args);
 
diff --git a/apps/plugins/lua/settings_helper.pl b/apps/plugins/lua/settings_helper.pl
index d45dcc14bc..0f7c4f8b04 100755
--- a/apps/plugins/lua/settings_helper.pl
+++ b/apps/plugins/lua/settings_helper.pl
@@ -25,7 +25,7 @@ use warnings;
 #  first pass outputs a c file that shall be compiled with the -S option
 #  second pass extracts the member, offset, size, type from the assembly
 
-my $svnrev = '$Revision$';
+my $svnrev = '';
 my $helper_name = 'LUA_RB_SETTINGS_H_HELPER';
 
 ############# configuration #############
diff --git a/tools/mp3info.pm b/tools/mp3info.pm
index 10c5c20920..c31e86fcef 100644
--- a/tools/mp3info.pm
+++ b/tools/mp3info.pm
@@ -16,7 +16,7 @@ use Carp;
 use Fcntl qw(:seek);
 
 use vars qw(
-	@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION $REVISION
+	@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION
 	@mp3_genres %mp3_genres @winamp_genres %winamp_genres $try_harder
 	@t_bitrate @t_sampling_freq @frequency_tbl %v1_tag_fields
 	@v1_tag_names %v2_tag_names %v2_to_v1_names $AUTOLOAD
@@ -36,8 +36,6 @@ use vars qw(
 	all	=> [@EXPORT, @EXPORT_OK]
 );
 
-# $Id$
-($REVISION) = ' $Revision$ ' =~ /\$Revision:\s+([^\s]+)/;
 $VERSION = '1.26'; # Just adds metadata 
 
 # JRF: Whether we're debugging the ID3v2.4 support