diff --git a/glibc.spec b/glibc.spec
index af08df2..258dbf9 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1010,7 +1010,6 @@ build
 pushd build-%{target}
 $GCC -static -L. -Os -g %{SOURCE2} \
 	-o glibc_post_upgrade.%{_target_cpu} \
-	'-DLIBTLS="/%{_lib}/tls/"' \
 	'-DGCONV_MODULES_DIR="%{_libdir}/gconv"' \
 	'-DLD_SO_CONF="/etc/ld.so.conf"' \
 	'-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"'
diff --git a/glibc_post_upgrade.c b/glibc_post_upgrade.c
index 134607b..1658507 100644
--- a/glibc_post_upgrade.c
+++ b/glibc_post_upgrade.c
@@ -51,18 +51,10 @@ main (void)
   const char *remove_dirs[] =
     {
 #if defined (__i386__)
-      "/lib/tls",
       "/lib/i686",
-      "/lib/tls/i486",
-      "/lib/tls/i586",
-      "/lib/tls/i686",
       "/lib/i686/nosegneg",
 #elif defined (__powerpc64__) && _CALL_ELF != 2
       "/lib64/power6",
-#elif defined (LIBTLS)
-      LIBTLS,
-#else
-      "/lib/tls",
 #endif
     };
   for (j = 0; j < sizeof (remove_dirs) / sizeof (remove_dirs[0]); ++j)