diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index fb5bb98e48c..e132f30d3c3 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -21,7 +21,7 @@ LDFLAGS+=	-shared -Wl,-Bsymbolic
 DPADD=		${LIBC_PIC}
 LDADD=		-lc_pic
 
-.if defined(SYMVER_ENABLED)
+.if defined(SYMVER_ENABLED) && 0
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 VERSION_DEF=	${.CURDIR}/Versions.def
 VERSION_MAP=	Version.map
diff --git a/libexec/rtld-elf/Symbol.map b/libexec/rtld-elf/Symbol.map
index 571f8f13448..cb6926ebcf9 100644
--- a/libexec/rtld-elf/Symbol.map
+++ b/libexec/rtld-elf/Symbol.map
@@ -11,8 +11,11 @@ FBSD_1.0 {
     dllockinit;
     dlinfo;
     dl_iterate_phdr;
+    __tls_get_addr;
+};
+
+FBSDprivate {
     _rtld_thread_init;
     _rtld_allocate_tls;
     _rtld_free_tls;
-    __tls_get_addr;
 };
diff --git a/libexec/rtld-elf/Versions.def b/libexec/rtld-elf/Versions.def
index d8df441ad3c..983d93edd5a 100644
--- a/libexec/rtld-elf/Versions.def
+++ b/libexec/rtld-elf/Versions.def
@@ -2,3 +2,6 @@
 
 FBSD_1.0 {
 };
+
+FBSDprivate {
+};