Index: /0.9.3/pb/bin/pb
===================================================================
--- /0.9.3/pb/bin/pb	(revision 516)
+++ /0.9.3/pb/bin/pb	(revision 518)
@@ -1551,5 +1551,5 @@
 		my $keyfile = pb_ssh_get(1);
 		
-		my ($vmhost,$vmport) = pb_conf_get("vmhost","vmport");
+		my ($vmhost,$vmport,$vmntp) = pb_conf_get("vmhost","vmport","vmntp");
 		my $nport = $vmport->{$ENV{'PBPROJ'}};
 		$nport = "$pbport" if (defined $pbport);
@@ -1581,4 +1581,8 @@
 use strict;
 use File::Copy;
+
+# We should not need in this script more functions than what is provided 
+# by Base and Distribution to avoid problems at exec time.
+# They are appended at the end.
 
 our $pbdebug;
@@ -1600,4 +1604,5 @@
 my $count = 0;
 while (<PBFILE>) {
+
 EOF
 		print SCRIPT << "EOF";
@@ -1611,4 +1616,8 @@
 rename("\$file1.new",\$file1);
 chmod 0600,\$file1;
+
+# Sync date
+pb_system("/usr/sbin/ntpdate \$vmntp->{'PBPRROJ'}","Syncing date to \$vmntp{'PBPRROJ'}");
+
 EOF
 	}
@@ -1720,11 +1729,8 @@
 }
 
-# Sync date
-#system "/usr/sbin/ntpdate ntp.pool.org";
-
 pb_system("rm -rf perl-ProjectBuilder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/perl-ProjectBuilder-latest.tar.gz ; tar xvfz perl-ProjectBuilder-latest.tar.gz ; cd perl-ProjectBuilder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf perl-ProjectBuilder-* ; rm -rf project-builder-* ; wget --passive-ftp ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; tar xvfz project-builder-latest.tar.gz ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf project-builder-* ;","Building Project-Builder");
 system "pb 2>&1 | head -5";
 EOF
-	# Adds pb_distro_init from ProjectBuilder::Distribution
+	# Adds pb_distro_init from ProjectBuilder::Distribution and Base
 	foreach my $d (@INC) {
 		my @f = ("$d/ProjectBuilder/Base.pm","$d/ProjectBuilder/Distribution.pm");
@@ -1793,9 +1799,12 @@
 	}
 
-	pb_system("yum -y $opt install rpm-build wget patch ntp sudo perl-DateManip perl-File-MimeInfo perl-ExtUtils-MakeMaker perl-Mail-Sendmail",$cmtall);
 	if ($dver eq 4) {
+		pb_system("yum -y $opt install rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker",$cmtall);
 		pb_system("$insmb","$cmtmb");
 		pb_system("$insfm","$cmtfm");
 		pb_system("$insfb","$cmtfb");
+		pb_system("$insms","$cmtms");
+	} else {
+		pb_system("yum -y $opt install rpm-build wget patch ntp sudo perl-DateManip perl-ExtUtils-MakeMaker perl-File-MimeInfo perl-Mail-Sendmail",$cmtall);
 	}
 } elsif (( $dfam eq "rh" ) || ($ddir eq "sles") || (($ddir eq "suse") && (($dver eq "10.1") || ($dver eq "10.0"))) || ($ddir eq "slackware")) {