Index: tools/configure
===================================================================
--- tools/configure	(revision 14056)
+++ tools/configure	(working copy)
@@ -1733,23 +1733,23 @@
 	\$(SILENT)\$(MAKE) -C \$(APPSDIR)/plugins/lib tags
 
 fontzip:
-	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" -f 1 -o rockbox-fonts.zip \$(TARGET) \$(BINARY)
+	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" -m -f 1 -o rockbox-fonts.zip \$(TARGET) \$(BINARY)
 
 zip:
-	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" -m \$(TARGET) \$(BINARY)
 
 mapzip:
 	\$(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip
 
 fullzip:
-	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" -f 2 -o rockbox-full.zip \$(TARGET) \$(BINARY)
+	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" -m -f 2 -o rockbox-full.zip \$(TARGET) \$(BINARY)
 
 7zip:
-	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" -m \$(TARGET) \$(BINARY)
 
 tar:
 	\$(SILENT)rm -f rockbox.tar
-	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -o "rockbox.tar" -z "tar --no-recursion -uf" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -o "rockbox.tar" -z "tar --no-recursion -uf" -r "\$(ROOTDIR)" -m \$(TARGET) \$(BINARY)
 
 bzip2: tar
 	\$(SILENT)bzip2 -f9 rockbox.tar
Index: tools/buildzip.pl
===================================================================
--- tools/buildzip.pl	(revision 14056)
+++ tools/buildzip.pl	(working copy)
@@ -17,6 +17,7 @@
 my $target;
 my $archos;
 my $incfonts;
+my $incmaps;
 
 while(1) {
     if($ARGV[0] eq "-r") {
@@ -48,6 +49,10 @@
         shift @ARGV;    
     }
 
+    elsif($ARGV[0] eq "-m") {
+        $incmaps =1;
+        shift @ARGV;
+    }
     elsif($ARGV[0] eq "-v") {
         $verbose =1;
         shift @ARGV;
@@ -390,6 +395,34 @@
 
     buildlangs(".rockbox/langs");
 
+    if($incmaps) {
+        mkdir ".rockbox/maps", 0777;
+        `cp apps/rockbox.map .rockbox/maps/`;
+
+        my @map_folders;
+        if($swcodec) {
+            @map_folders = ("codecs", "plugins");
+        } else {
+            @map_folders = ("plugins");
+        }
+
+        foreach my $map_folder (@map_folders) {
+            mkdir ".rockbox/maps/$map_folder", 0777;
+            opendir(DIR, "apps/$map_folder") || die "can't open apps/$map_folder dir";
+            my @maps = grep { /\.map$/ && -f "apps/$map_folder/$_" } readdir(DIR);
+            closedir DIR;
+
+            for(@maps) {
+                my $m = $_;
+
+                print "MAP: $map_folder/$m\n" if($verbose);
+                `cp apps/$map_folder/$m .rockbox/maps/$map_folder/`;
+
+            }
+        }
+    }
+
+
 }
 
 my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =