diff --git a/fdisk/module.info b/fdisk/module.info
index 45b3ef85f..c119eb8c4 100644
--- a/fdisk/module.info
+++ b/fdisk/module.info
@@ -2,7 +2,7 @@ name=Partition Manager
 category=hardware
 os_support=*-linux
 desc=Partitions on Local Disks
-depends=mount proc raid
+depends=mount proc
 longdesc=Create and edit partitions on local SCSI, IDE and SATA disks on Linux.
 novserver=1
 noopenvz=1
diff --git a/lvm/lvm-lib.pl b/lvm/lvm-lib.pl
index cf4896a7d..72ca76cfd 100755
--- a/lvm/lvm-lib.pl
+++ b/lvm/lvm-lib.pl
@@ -934,13 +934,15 @@ foreach $d (&fdisk::list_disks_partitions()) {
 		}
 	}
 
-# Show available RAID devices
-local $conf = &raid::get_raidtab();
-foreach $c (@$conf) {
-	next if ($used{$c->{'value'}});
-	local @ds = &device_status($c->{'value'});
-	next if (@ds);
-	push(@opts, [ $c->{'value'}, &text('pv_raid', $c->{'value'} =~ /md(\d+)$/ ? "$1" : $c->{'value'}) ]);
+# Show available RAID devices when the module is installed
+if ($has_raid) {
+	local $conf = &raid::get_raidtab();
+	foreach $c (@$conf) {
+		next if ($used{$c->{'value'}});
+		local @ds = &device_status($c->{'value'});
+		next if (@ds);
+		push(@opts, [ $c->{'value'}, &text('pv_raid', $c->{'value'} =~ /md(\d+)$/ ? "$1" : $c->{'value'}) ]);
+		}
 	}
 
 push(@opts, [ '', $text{'pv_other'} ]);