diff -r 71122b8e1c7b -r c2478fad90aa common/tools/populateziptemplate.pl
--- a/common/tools/populateziptemplate.pl	Tue May 19 16:12:17 2009 +0100
+++ b/common/tools/populateziptemplate.pl	Tue May 19 17:40:43 2009 +0100
@@ -57,7 +57,7 @@
 {
 	warn "Warning: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst};
 	$package->{dst} =~ s{^/}{}g;
-	if ($package->{source} =~ m{/(sfl|oss)/sf/([^/]+)/([^/]+)})
+	if ($package->{source} =~ m{/(sfl|oss)/(MCL|FCL)/sf/([^/]+)/([^/]+)})
 	{	    
 		push @{$zipConfig->{config}->{config}->{src}->{config}->{$1}->{config}},
 		{
@@ -65,7 +65,7 @@
 			[
 				{
 					name => "name",
-					value=> "src_$1_$2_$3",
+					value=> "src_$1_$3_$4",
 				},
 				{
 					name => "include",