--- perl-module.eclass	2010-04-10 17:56:40.000000000 +0200
+++ perl-module.eclass	2010-04-10 17:57:09.000000000 +0200
@@ -85,7 +85,7 @@
 	# Disable ExtUtils::AutoInstall from prompting
 	export PERL_EXTUTILS_AUTOINSTALL="--skipdeps"
 
-	if [[ ${PREFER_BUILDPL} == yes && -f Build.PL ]] ; then
+	if [[ (( ${PREFER_BUILDPL} == yes ) || ( ! -f Makefile.PL )) && ( -f Build.PL ) ]] ; then
 		einfo "Using Module::Build"
 		if [[ ${DEPEND} != *virtual/perl-Module-Build* && ${PN} != Module-Build ]] ; then
 			ewarn "QA Notice: The ebuild uses Module::Build but doesn't depend on it."