4 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5f03e6081..f27bdb673 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,6 @@
 - drakauth: don't update UsePAM option in sshd configuration
+- diskdrake: install nfs-utils instead of nfs-utils-clients
+  (#6570, merged back in nfs-utils)
 
 Version 14.21 - 11 May 2012
 
diff --git a/perl-install/fs/remote/nfs.pm b/perl-install/fs/remote/nfs.pm
index 7ebda3b11..99e9b7b04 100644
--- a/perl-install/fs/remote/nfs.pm
+++ b/perl-install/fs/remote/nfs.pm
@@ -28,7 +28,7 @@ sub to_dev_raw {
 
 sub check {
     my ($_class, $in) = @_;
-    $in->do_pkgs->ensure_binary_is_installed('nfs-utils-clients', 'showmount') or return;
+    $in->do_pkgs->ensure_binary_is_installed('nfs-utils', 'showmount') or return;
     require services;
     services::start_not_running_service('portmap');
     services::start('nfs-common'); #- TODO: once nfs-common is fixed, it could use start_not_running_service()
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 066c7086e..ca8d027e4 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake: install nfs-utils instead of nfs-utils-clients
+  (#6570, merged back in nfs-utils)
+
 Version 14.30 - 23 June 2012
 
 - show all errors at once when setting media
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 89c0b0b14..04660aebf 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -546,7 +546,7 @@ sub default_packages {
     }
 
     add_n_log("/proc/cmdline=~/brltty=/", "brltty") if cat_("/proc/cmdline") =~ /brltty=/;
-    add_n_log("method==nfs", "nfs-utils-clients") if $o->{method} eq "nfs";
+    add_n_log("method==nfs", "nfs-utils") if $o->{method} eq "nfs";
     add_n_log("have RAID", "mdadm") if !is_empty_array_ref($o->{all_hds}{raids});
     add_n_log("have LVM", "lvm2") if !is_empty_array_ref($o->{all_hds}{lvms});
     add_n_log("have crypted DM", "cryptsetup") if !is_empty_array_ref($o->{all_hds}{dmcrypts});