--- /usr/lib64/portage/bin/ebuild-helpers/prepstrip	2011-08-06 15:56:20.000000000 +0200
+++ prepstrip	2011-08-06 15:55:59.000000000 +0200
@@ -119,14 +119,14 @@
 # Now we look for unstripped binaries.
 for x in \
 	$(scanelf -yqRBF '#k%F' -k '.symtab' "$@") \
-	$(find "$@" -type f -name '*.a')
+	$(find "$@" -type f -name '*.a' -or -name '*.exe' -or -name '*.dll')
 do
 	if ! ${banner} ; then
 		vecho "strip: ${STRIP} ${PORTAGE_STRIP_FLAGS}"
 		banner=true
 	fi
 
-	f=$(file "${x}") || continue
+	f=$(file -b "${x}") || continue
 	[[ -z ${f} ]] && continue
 
 	if ! ${SKIP_STRIP} ; then
@@ -149,13 +149,13 @@
 	# actually causes problems.  install sources for all
 	# elf types though cause that stuff is good.
 
-	if [[ ${f} == *"current ar archive"* ]] ; then
+	if [[ ${f} == "current ar archive" ]] ; then
 		vecho "   ${x:${#D}}"
 		if ${strip_this} ; then
 			# hmm, can we split debug/sources for .a ?
 			${STRIP} -g "${x}"
 		fi
-	elif [[ ${f} == *"SB executable"* || ${f} == *"SB shared object"* ]] ; then
+	elif [[ ${f} == *"SB executable"* || ${f} == *"SB shared object"* || ${f} == "PE32"* ]] ; then
 		vecho "   ${x:${#D}}"
 		save_elf_sources "${x}"
 		if ${strip_this} ; then