diff --git a/ChangeLog b/ChangeLog
index c5299e8678..2ea7c7a53c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-08  Carlos O'Donell <carlos@baldric.uwo.ca>
+
+	* FAQ.in: Explain why `make' might fail running rpcgen.
+	* FAQ: Regenerated.
+
 2005-04-07  Roland McGrath  <roland@redhat.com>
 
 	* po/libc.pot: Regenerated.
diff --git a/FAQ b/FAQ
index 6d95ef332d..77bd47e3ed 100644
--- a/FAQ
+++ b/FAQ
@@ -48,6 +48,8 @@ please let me know.
 	malloc/libmemprof.so.  How can I fix this?
 1.20.	Which tools should I use for MIPS?
 1.21.	Which compiler should I use for powerpc64?
+1.22.	`make' fails when running rpcgen the first time,
+	what is going on? How do I fix this?
 
 2. Installation and configuration issues
 
@@ -573,6 +575,20 @@ For details check also my page <http://www.suse.de/~aj/glibc-mips.html>.
 {SM} You want to use at least gcc 3.2 (together with the right versions
 of all the other tools, of course).
 
+
+1.22.	`make' fails when running rpcgen the first time,
+	what is going on? How do I fix this?
+
+{CO} The first invocation of rpcgen is also the first use of the recently
+compiled dynamic loader.  If there is any problem with the dynamic loader
+it will more than likely fail to run rpcgen properly. This could be due to
+any number of problems.
+
+The only real solution is to debug the loader and determine the problem
+yourself. Please remember that for each architecture there may be various
+patches required to get glibc HEAD into a runnable state. The best course
+of action is to determine if you have all the required patches.
+
 
 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
 
diff --git a/FAQ.in b/FAQ.in
index 4c161cceb6..227132bc08 100644
--- a/FAQ.in
+++ b/FAQ.in
@@ -374,6 +374,19 @@ For details check also my page <http://www.suse.de/~aj/glibc-mips.html>.
 {SM} You want to use at least gcc 3.2 (together with the right versions
 of all the other tools, of course).
 
+??	`make' fails when running rpcgen the first time,
+	what is going on? How do I fix this?
+
+{CO} The first invocation of rpcgen is also the first use of the recently
+compiled dynamic loader.  If there is any problem with the dynamic loader
+it will more than likely fail to run rpcgen properly. This could be due to
+any number of problems.
+
+The only real solution is to debug the loader and determine the problem
+yourself. Please remember that for each architecture there may be various
+patches required to get glibc HEAD into a runnable state. The best course
+of action is to determine if you have all the required patches.
+
 ? Installation and configuration issues
 
 ??	Can I replace the libc on my Linux system with GNU libc?