diff --git a/ChangeLog b/ChangeLog
index 502b3fadf4..dfb4bd188d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-30  Ulrich Drepper  <drepper@redhat.com>
 
+	* nscd/nscd.h (struct database_dyn): Change filename to an array
+	to avoid relocations.
+
 	* elf/ldd.bash.in: If --verify loop fails to find a dynamic linker
 	for the file don't just try the first one listed in RTLDLIST
 	again.  We already have the status.
diff --git a/nscd/nscd.h b/nscd/nscd.h
index f826c7ada4..8b95630807 100644
--- a/nscd/nscd.h
+++ b/nscd/nscd.h
@@ -64,11 +64,11 @@ struct database_dyn
   int persistent;
   int shared;
   int propagate;
-  size_t max_db_size;
-  const char *filename;
+  const char filename[12];
   const char *db_filename;
   time_t file_mtime;
   size_t suggested_module;
+  size_t max_db_size;
 
   unsigned long int postimeout;	/* In seconds.  */
   unsigned long int negtimeout;	/* In seconds.  */