diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 403cec9c..88f09946 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -10,6 +10,7 @@ Anthony Martin <ality@pbrane.org>
 Anthony Sorace <a@9srv.net>
 Arvindh Rajesh Tamilmani <art@a-30.net>
 Benjamin Huntsman <BHuntsman@mail2.cu-portland.edu>
+Christopher Brannon <chris@the-brannons.com>
 David du Colombier <0intro@gmail.com>
 David Jeannot <djeannot24@gmail.com>
 David Swasey <david.swasey@gmail.com>
diff --git a/bin/9l b/bin/9l
index 864b2f1f..3043c1c8 100755
--- a/bin/9l
+++ b/bin/9l
@@ -40,7 +40,7 @@ case "$tag" in
 	userpath=true
 	extralibs="$extralibs -lutil"
 	case "${SYSVERSION:-`uname -r`}" in
-	2.6.*)
+	2.6.* | 3.*)
 		extralibs="$extralibs -lpthread"
 		;;
 	esac
@@ -297,6 +297,7 @@ then
 	autoframeworks=""
 	if [ "x$ofiles" != "x" ]
 	then
+echo >&2 ofiles $ofiles
 		a=`
 			nm $ofiles |
 			grep '__p9l_autoframework_[a-zA-Z0-9+-]*$' |