--- /usr/portage/eclass/kernel-2.eclass.orig	2011-03-21 21:01:12.000000000 -0400
+++ /usr/portage/eclass/kernel-2.eclass	2011-04-02 17:29:22.388571582 -0400
@@ -332,11 +332,11 @@
 
 	# Bug #266157, deblob for libre support
 	if [[ -z ${K_PREDEBLOBBED} ]] ; then
-		if [[ -z ${K_DEBLOB_AVAILABLE} ]] ; then
-			kernel_is ge 2 6 27 && \
+		# Bug #359865, force a call to detect_version if needed
+		kernel_is ge 2 6 27 && \
+			[[ -z "${K_DEBLOB_AVAILABLE}" ]] && \
 				kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \
-				K_DEBLOB_AVAILABLE=1
-		fi
+					K_DEBLOB_AVAILABLE=1
 		if [[ ${K_DEBLOB_AVAILABLE} == "1" ]] ; then
 			IUSE="${IUSE} deblob"
 			# Reflect that kernels contain firmware blobs unless otherwise