diff --git a/cpan/config.info b/cpan/config.info
index 637f99ebf..6a7f9166a 100644
--- a/cpan/config.info
+++ b/cpan/config.info
@@ -3,7 +3,7 @@ refresh_days=Days before refreshing CPAN module list,0,5
 save_partial=Keep downloaded module if install fails?,1,1-Yes,0-No
 def_args=Default arguments to Makefile.PL,0
 incpackages=Include Perl modules from software packages?,1,1-Yes,0-No
-incyum=Install Perl modules from YUM or APT where available?,1,1-Yes,0-No
+incyum=Install Perl modules from software packages where available?,1,1-Yes,0-No
 line2=System configuration,11
 packages=CPAN perl modules list,0
 cpan=CPAN modules base URL,0
diff --git a/cpan/cpan-lib.pl b/cpan/cpan-lib.pl
index 2bf5af5b7..2586a7124 100755
--- a/cpan/cpan-lib.pl
+++ b/cpan/cpan-lib.pl
@@ -346,13 +346,18 @@ else {
 local @rv;
 foreach my $a (@avail) {
 	if ($a->{'name'} =~ /^lib(\S+)-perl$/ ||	# Debian
-	    $a->{'name'} =~ /^perl-(\S+)$/) {		# Redhat
+	    $a->{'name'} =~ /^perl-(\S+)$/ ||		# Redhat
+	    $a->{'name'} =~ /^p5-(\S+)$/) {		# FreeBSD
 		local $mod = $1;
 		$mod =~ s/-/::/g;
 		if ($mod eq "LDAP") {
 			# Special case for redhat-ish systems
 			$mod = "Net::LDAP";
 			}
+		elsif ($mod eq "perl::ldap") {
+			# Special case for FreeBSD
+			$mod = "Net::LDAP";
+			}
 		push(@rv, { 'mod' => $mod,
 			    'package' => $a->{'name'},
 			    'version' => $a->{'version'}, });