diff --git a/package-updates/CHANGELOG b/package-updates/CHANGELOG
index 7bae4d2a0..5a9e275fd 100644
--- a/package-updates/CHANGELOG
+++ b/package-updates/CHANGELOG
@@ -2,3 +2,5 @@
 First version of this module.
 ---- Changes since 1.500 ----
 Debian backport versions are no longer falsely suggested for upgrading, if the apt-show-versions command is installed.
+---- Changes since 1.790 ----
+When updating multiple packages, they are done in a single YUM or APT operation if possible.
diff --git a/package-updates/config b/package-updates/config
index 595c27609..226c127d1 100644
--- a/package-updates/config
+++ b/package-updates/config
@@ -1 +1,2 @@
 cache_time=6
+update_multiple=1
diff --git a/package-updates/config.info b/package-updates/config.info
index 8c20d8369..f95b903ef 100644
--- a/package-updates/config.info
+++ b/package-updates/config.info
@@ -1 +1,2 @@
 cache_time=Hours to cache updated and available packages for,3,Don't cache
+update_multiple=Update multiple packages,1,1-All at once,0-One by one
diff --git a/package-updates/update.cgi b/package-updates/update.cgi
index 92bb3de5f..bdbcc40da 100755
--- a/package-updates/update.cgi
+++ b/package-updates/update.cgi
@@ -85,18 +85,36 @@ else {
 
 		# Do it
 		$msg = $in{'mode'} eq 'new' ? 'update_pkg2' : 'update_pkg';
-		foreach my $ps (@pkgs) {
-			($p, $s) = split(/\//, $ps);
-			next if ($donedep{$p});
-			print &text($msg, "<tt>$p</tt>"),"<br>\n";
-			print "<ul>\n";
-			@pgot = &package_install($p, $s);
-			foreach $g (@pgot) {
-				$donedep{$g}++;
+		if ($config{'update_multiple'}) {
+			# Update all packages at once
+			@pkgnames = ( );
+			foreach my $ps (@pkgs) {
+                                ($p, $s) = split(/\//, $ps);
+				push(@pkgnames, $p);
+				$pkgsystem ||= $s;
 				}
-			push(@got, @pgot);
+			print &text($msg, "<tt>".join(" ", @pkgnames)."</tt>"),
+			      "<br>\n";
+			print "<ul>\n";
+			@got = &package_install_multiple(\@pkgnames,
+							 $pkgsystem);
 			print "</ul><br>\n";
 			}
+		else {
+			# Do them one by one in a loop
+			foreach my $ps (@pkgs) {
+				($p, $s) = split(/\//, $ps);
+				next if ($donedep{$p});
+				print &text($msg, "<tt>$p</tt>"),"<br>\n";
+				print "<ul>\n";
+				@pgot = &package_install($p, $s);
+				foreach $g (@pgot) {
+					$donedep{$g}++;
+					}
+				push(@got, @pgot);
+				print "</ul><br>\n";
+				}
+			}
 		if (@got) {
 			print &text('update_ok', scalar(@got)),"<p>\n";
 			}
diff --git a/software/yum-lib.pl b/software/yum-lib.pl
index cfd980f9d..249d0abec 100755
--- a/software/yum-lib.pl
+++ b/software/yum-lib.pl
@@ -18,7 +18,7 @@ sub list_update_system_commands
 return ($yum_command);
 }
 
-# update_system_install([package], [&in])
+# update_system_install([packages], [&in])
 # Install some package with yum
 sub update_system_install
 {