diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index a28f30b5d..28fdee67e 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,5 +1,8 @@
 2003-12-05  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/po/ru.po: Update Russian translation for 0.98.
+	* doc/gramps-manual/C/getstart.xml: More "open a directory" stuff. 
+	* src/gramps.glade: Add Help button to opendb dialog.
+	* src/DbPrompter.py (open_help_clicked): Add function.
 
 2003-12-04  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* doc/gramps-manual/C/getstart.xml: Remove ZODB support section. 
diff --git a/gramps2/doc/gramps-manual/C/getstart.xml b/gramps2/doc/gramps-manual/C/getstart.xml
index 8ec6af154..e758df265 100644
--- a/gramps2/doc/gramps-manual/C/getstart.xml
+++ b/gramps2/doc/gramps-manual/C/getstart.xml
@@ -120,6 +120,14 @@
       possible copies of media objects. This directory will be updated by &app; 
       each time the database is saved. </para> 
       
+      <para>NOTE: when opening an existing database, you should 
+      open a <replaceable>DIRECTORY</replaceable> and 
+      <replaceable>NOT a FILE</replaceable>. The directory you need to open 
+      should contain the  database file <replaceable>data.gramps</replaceable> 
+      as well as any possible copies of media objects. Such a directory is 
+      created by &app; when you start a new database and is updated each time 
+      the database is saved. </para> 
+
       </sect2>
       
 <!-- ================ Getting Started Sub-subsection  
@@ -165,6 +173,11 @@
 	in the help browser.  </para></listitem>
 	</varlistentry>
 
+	<varlistentry><term>FAQ</term>
+	<listitem><para> Use this item to read Frequently Asked Questions
+	about &app; in the browser. </para></listitem>
+	</varlistentry>
+    
 	<varlistentry><term>GRAMPS home page</term>
 	<listitem><para> Select this item to open home page of &app; in your
 	default web browser. </para></listitem>
diff --git a/gramps2/src/DbPrompter.py b/gramps2/src/DbPrompter.py
index 6298240c4..336623a9f 100644
--- a/gramps2/src/DbPrompter.py
+++ b/gramps2/src/DbPrompter.py
@@ -18,6 +18,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+# $Id$
+
 #-------------------------------------------------------------------------
 #
 # GNOME modules
@@ -25,6 +27,7 @@
 #-------------------------------------------------------------------------
 import gtk
 import gtk.glade
+import gnome
 
 #-------------------------------------------------------------------------
 #
@@ -62,6 +65,7 @@ class DbPrompter:
         
         opendb.signal_autoconnect({
             "on_open_ok_clicked" : self.open_ok_clicked,
+            "on_open_help_clicked" : self.open_help_clicked,
             "on_open_cancel_clicked" : self.open_cancel_clicked,
             "on_opendb_delete_event": self.open_delete_event,
             })
@@ -78,6 +82,10 @@ class DbPrompter:
             self.open_activate()
         Utils.destroy_passed_object(obj)
 
+    def open_help_clicked(self,obj):
+        """Display the GRAMPS manual"""
+        gnome.help_display('gramps-manual','choose-db-start')
+
     def save_as_activate(self):
         wFs = gtk.glade.XML (const.gladeFile, "fileselection","gramps")
         wFs.signal_autoconnect({
diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade
index b196e42d2..8b2c606d8 100644
--- a/gramps2/src/gramps.glade
+++ b/gramps2/src/gramps.glade
@@ -6478,6 +6478,19 @@
 	      <signal name="clicked" handler="on_open_ok_clicked" object="opendb"/>
 	    </widget>
 	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="button168">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-help</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="response_id">-11</property>
+	      <signal name="clicked" handler="on_open_help_clicked" last_modification_time="Fri, 05 Dec 2003 20:06:22 GMT"/>
+	    </widget>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>