diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index a8d1d286035f..b6bd68064ece 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -7,6 +7,16 @@ CFLAGS+= ${CPPFLAGS}
 
 .include "${.CURDIR}/arch/${MACHINE}/Makefile.inc"
 .include "${.CURDIR}/pthreads/Makefile.inc"
+
+all: preall
+
+preall:
+	if [ ! -e include/pthread ]; then; \
+		ln -s . include/pthread; \
+	fi
+	if [ ! -e arch/${MACHINE}/pthread ]; then; \
+		ln -s . arch/${MACHINE}/pthread; \
+	fi
 	
 .include <bsd.lib.mk>
 
diff --git a/lib/libpthread/README b/lib/libpthread/README
index 198be02046dd..e77c79e887ef 100644
--- a/lib/libpthread/README
+++ b/lib/libpthread/README
@@ -5,7 +5,7 @@ at the Winter 93 USENIX conference.
 It is currently being designed and written by me, Chris Provenzano.
 All bug, comments, and questions can be sent me at either
 proven@athena.mit.edu or proven@sun-lamp.cs.berkeley.edu
-Please don't send bugs or patches to any of the NetBSD mailing lists.
+Please don't send questions, bugs or patches to any of the NetBSD mailing lists.
 
 Thanks goes to John Carr jfc@mit.edu for porting this to the IBM/RT,
 and for his bug reports and fixes.