diff --git a/bin/9c b/bin/9c
index 6ff417a8..fcdae6fd 100755
--- a/bin/9c
+++ b/bin/9c
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+test -f $PLAN9/config && . $PLAN9/config
 usegcc()
 {
 	cc=gcc
diff --git a/bin/9l b/bin/9l
index cd3d0ac9..7ea689d1 100755
--- a/bin/9l
+++ b/bin/9l
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+test -f $PLAN9/config && . $PLAN9/config
 libsl=""
 
 doautolib=true
@@ -173,7 +174,7 @@ case "$tag" in
 *Linux*)
 	ld=gcc
 	extralibs="$extralibs -lutil"
-	case "`uname -r`" in
+	case "${SYSVERSION:-`uname -r`}" in
 	2.6.*)
 		extralibs="$extralibs -lpthread"
 		;;