diff --git a/ChangeLog b/ChangeLog
index 3729dbe39..8a81b8716 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-26  Ramiro Estrugo  <ramiro@eazel.com>
+
+	* doc/nautilus.faq: Added faq.
+	
 2000-04-26  Pavel Cisler  <pavel@eazel.com>
 
 	* src/file-manager/fm-directory-view.c:
diff --git a/docs/nautilus.faq b/docs/nautilus.faq
new file mode 100644
index 000000000..c30fb2948
--- /dev/null
+++ b/docs/nautilus.faq
@@ -0,0 +1,14 @@
+1.  What is Nautilus ?
+
+  Nautilus is an open-source file manager and graphical shell being
+  developed by Eazel, Inc. and others. It is part of the GNOME project, and its
+  source code can be found in the GNOME CVS repository. Nautilus is still in
+  the early stages of development. It will become an integral part of the
+  GNOME desktop environment when it is finished.
+
+2.  What are some useful nautilus resources ?
+
+  See http://nautilus.eazel.com/
+
+
+