diff --git a/ChangeLog b/ChangeLog
index 0281cd5bc..bfdc42f9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-23  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* FAQ: New file.
+
+	* Makefile.am (EXTRA_DIST): Add FAQ
+
 2008-02-22  Ludovic Courtès  <ludo@gnu.org>
 
 	* configure.in: Check whether `strncasecmp' is declared.
diff --git a/FAQ b/FAQ
new file mode 100644
index 000000000..2ff6cad50
--- /dev/null
+++ b/FAQ
@@ -0,0 +1,19 @@
+Guile FAQ                       -*- outline -*-
+
+* Build problems
+
+** readline.c: error: `rl_pending_input' undeclared
+
+This occurs if the Readline library detected by Guile's configure
+script is actually the BSD Editline project's supposedly
+Readline-compatible library.  The immediate fix is to uninstall
+Editline and install the real GNU Readline instead.  When you do this,
+please note that it probably won't work to keep Editline in /usr and
+install GNU Readline in /usr/local (or some similar arrangement),
+because the Editline library will then still be picked up at link and
+run time; it's best (subject to other constraints) to remove Editline
+completely.
+
+For the longer term, please also report this problem to the Editline
+project, to encourage them to fix it in the next release of their
+Readline compatibility library.
diff --git a/Makefile.am b/Makefile.am
index 8de4ab380..540653d2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ include_HEADERS = libguile.h
 
 # automake sometimes forgets to distribute acconfig.h,
 # apparently depending on the phase of the moon.
-EXTRA_DIST = LICENSE HACKING GUILE-VERSION ANON-CVS SNAPSHOTS
+EXTRA_DIST = LICENSE HACKING GUILE-VERSION ANON-CVS SNAPSHOTS FAQ
 
 TESTS = check-guile
 
diff --git a/NEWS b/NEWS
index 8f6d759f5..2c245ce96 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,13 @@ would trigger an unbound variable error for `match:andmap'.
 ** Fixed build issue on NetBSD 1.6
 ** Fixed build issue on Solaris 2.10 x86_64
 
+* Changes to the distribution
+
+** New FAQ
+
+We've started collecting Frequently Asked Questions (FAQ), and will
+distribute these (with answers!) in future Guile releases.
+
 
 Changes in 1.8.4 (since 1.8.3)