--- util-linux-2.16.1.ebuild	2009-11-24 11:53:22.000000000 +0100
+++ util-linux-2.16.1.ebuild	2009-11-24 11:42:26.000000000 +0100
@@ -46,7 +48,18 @@ 
 	else
 		use loop-aes && epatch "${WORKDIR}"/${P}-loop-aes.patch
 	fi
-	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
+	if use uclibc ; then
+		sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
+		sed -i -e 's/program_invocation_short_name/"findfs"/' misc-utils/findfs.c
+		sed -i -e 's/program_invocation_short_name/"namei"/' misc-utils/namei.c
+		sed -i -e 's/program_invocation_short_name/"scriptreplay"/' misc-utils/scriptreplay.c
+		sed -i -e 's/program_invocation_short_name/"ipcmk"/' sys-utils/ipcmk.c
+		sed -i -e 's/program_invocation_short_name/"setarch"/' sys-utils/setarch.c
+		sed -i -e 's/program_invocation_short_name/"lscpu"/' sys-utils/lscpu.c
+		sed -i -e 's/program_invocation_short_name/"ldattach"/' sys-utils/ldattach.c
+		sed -i -e 's/program_invocation_short_name/"swapon"/' mount/swapon.c
+		sed -i -e 's:test = SYS_sched_getaffinity:LSDJFLSKDF = asdfasdf:' configure
+	fi
 }
 
 src_configure() {