--- glibc-2.3.5-r3.ebuild	2006-01-10 16:00:31.000000000 -0500
+++ /usr/local/portage/sys-libs/glibc/glibc-2.3.5-r3.ebuild	2006-01-10 10:40:17.000000000 -0500
@@ -1061,11 +1061,6 @@
 	# give some sort of warning about the nptl logic changes...
 	if want_nptl && want_linuxthreads ; then
 
-		if use ppc ; then
-			eerror "glibc doesn't currently work with nptl and linuxthreads"
-			eerror "please select either nptlonly or -nptl"
-			die "nptlonly not set on ppc"
-		fi
 		ewarn "Warning! Gentoo's GLIBC with NPTL enabled now behaves like the"
 		ewarn "glibc from almost every other distribution out there. This means"
 		ewarn "that glibc is compiled -twice-, once with linuxthreads and once"
@@ -1270,6 +1265,11 @@
 			dosed  "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so
 		fi
 	fi
+
+	# PPC NPTL fix
+	if [[ $(tc-arch) == "ppc" ]] && use nptl && ! use nptlonly ; then
+		cp ${WORKDIR}/build-default-${CTARGET}-nptl/elf/ld.so ${D}/lib/ld-${PV}.so
+	fi
 }
 
 pkg_preinst() {