diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index f72cc828d73c..8ddaad4b541f 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -27,7 +27,8 @@ CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH}
 CFLAGS+=-I${.CURDIR}/../libthread_db
 CFLAGS+=-Winline
 
-VERSION_MAP=${.CURDIR}/pthread.map
+VERSION_DEF=${.CURDIR}/../libc/Versions.def
+SYMBOL_MAPS=${.CURDIR}/pthread.map
 
 MAN=	libthr.3
 
diff --git a/lib/libthr/pthread.map b/lib/libthr/pthread.map
index 5b243d0f1cff..5dddf4bbd443 100644
--- a/lib/libthr/pthread.map
+++ b/lib/libthr/pthread.map
@@ -6,7 +6,6 @@
  * Use the same naming scheme as libc.
  */
 FBSD_1.0 {
-global:
 	__error;
 	accept;
 	aio_suspend;
@@ -171,8 +170,6 @@ global:
 	waitpid;
 	write;
 	writev;
-local:
-	*;
 };
 
 /*
@@ -180,7 +177,6 @@ local:
  * These are not part of our application ABI.
  */
 FBSDprivate_1.0 {
-global:
 	___creat;
 	___pause;
 	___pselect;
@@ -388,17 +384,12 @@ global:
 	_thread_size_key;
 	_thread_state_running;
 	_thread_state_zoombie;
-local:
-	*;
 };
 
 FBSD_1.1 {
-global:
 	pthread_mutex_getspinloops_np;
 	pthread_mutex_getyieldloops_np;
 	pthread_mutex_isowned_np;
 	pthread_mutex_setspinloops_np;
 	pthread_mutex_setyieldloops_np;
-local:
-	*;
-} FBSD_1.0;
+};