diff --git a/elf/dl-tls.c b/elf/dl-tls.c
index 5204fda..3142b16 100644
--- a/elf/dl-tls.c
+++ b/elf/dl-tls.c
@@ -34,14 +34,12 @@
 
 
 /* Out-of-memory handler.  */
-#ifdef SHARED
 static void
 __attribute__ ((__noreturn__))
 oom (void)
 {
   _dl_fatal_printf ("cannot allocate memory for thread-local data: ABORT\n");
 }
-#endif
 
 
 size_t
@@ -397,6 +395,11 @@ _dl_allocate_tls_storage (void)
 }
 
 
+#ifndef SHARED
+extern dtv_t _dl_static_dtv[];
+# define _dl_initial_dtv (&_dl_static_dtv[1])
+#endif
+
 void *
 internal_function
 _dl_allocate_tls_init (void *result)
@@ -410,6 +413,47 @@ _dl_allocate_tls_init (void *result)
   size_t total = 0;
   size_t maxgen = 0;
 
+  /* Check if the current dtv is big enough.   */
+  if (dtv[-1].counter < GL(dl_tls_max_dtv_idx))
+    {
+      /* Reallocate the dtv.  */
+      dtv_t *newp;
+      size_t newsize = GL(dl_tls_max_dtv_idx) + DTV_SURPLUS;
+      size_t oldsize = dtv[-1].counter;
+
+      if (dtv == GL(dl_initial_dtv))
+	{
+	  /* This is the initial dtv that was allocated
+	     during rtld startup using the dl-minimal.c
+	     malloc instead of the real malloc.  We can't
+	     free it, we have to abandon the old storage.  */
+
+	  newp = malloc ((2 + newsize) * sizeof (dtv_t));
+	  if (newp == NULL)
+	    oom ();
+	  memcpy (newp, &dtv[-1], (2 + oldsize) * sizeof (dtv_t));
+	}
+      else
+	{
+	  newp = realloc (&dtv[-1],
+			  (2 + newsize) * sizeof (dtv_t));
+	  if (newp == NULL)
+	    oom ();
+	}
+
+      newp[0].counter = newsize;
+
+      /* Clear the newly allocated part.  */
+      memset (newp + 2 + oldsize, '\0',
+	      (newsize - oldsize) * sizeof (dtv_t));
+
+      /* Install this new dtv in the thread data structures.  */
+      INSTALL_DTV (result, newp);
+
+      /* Point dtv to the generation counter.  */
+      dtv = &newp[1];
+    }
+
   /* We have to prepare the dtv for all currently loaded modules using
      TLS.  For those which are dynamically loaded we add the values
      indicating deferred allocation.  */
@@ -492,11 +536,6 @@ _dl_allocate_tls (void *mem)
 rtld_hidden_def (_dl_allocate_tls)
 
 
-#ifndef SHARED
-extern dtv_t _dl_static_dtv[];
-# define _dl_initial_dtv (&_dl_static_dtv[1])
-#endif
-
 void
 internal_function
 _dl_deallocate_tls (void *tcb, bool dealloc_tcb)