diff --git a/software/urpmi-lib.pl b/software/urpmi-lib.pl
index 10d5055ac..0d538098a 100755
--- a/software/urpmi-lib.pl
+++ b/software/urpmi-lib.pl
@@ -12,7 +12,7 @@ sub update_system_install
 {
 local $update = $_[0] || $in{'update'};
 local (@rv, @newpacks);
-local $cmd = "urpmi --force --auto --media main";
+local $cmd = "urpmi --force --auto";
 print "<b>",&text('urpmi_install', "<tt>$cmd $update</tt>"),"</b><p>\n";
 print "<pre>";
 &additional_log('exec', undef, "$cmd $update");
@@ -57,11 +57,12 @@ print &ui_form_end();
 sub update_system_resolve
 {
 local ($name) = @_;
-return $name eq "apache" ? "apache2" :
-       $name eq "dhcpd" ? "dhcp-server" :
-       $name eq "mysql" ? "MySQL MySQL-client MySQL-common" :
+return $name eq "dhcpd" ? "dhcp-server" :
+       $name eq "mysql" ? "mariadb" :
+       $name eq "openldap" ? "openldap openldap-servers" :
        $name eq "postgresql" ? "postgresql postgresql-server" :
-			   $name;
+       $name eq "samba" ? "samba-client samba-server" :
+                          $name;
 }
 
 # update_system_available()
diff --git a/software/urpmi_upgrade.cgi b/software/urpmi_upgrade.cgi
index 2a8cef4d5..350982f53 100755
--- a/software/urpmi_upgrade.cgi
+++ b/software/urpmi_upgrade.cgi
@@ -10,7 +10,7 @@ if ($in{'upgrade'}) {
 	$mode = "upgrade";
 	}
 else {
-	$cmd = "urpmi.update main updates contrib";
+	$cmd = "urpmi.update -a";
 	$mode = "update";
 	}