diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 3001beea8..bf667bf6f 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-25  Alex Roitman  <shura@gramps-project.org>
+	* src/Makefile.am: Include BaseDoc in the docmodules list.
+	* src/GrampsDb/_GrampsBSDDB.py: Different order of closing.
+
 2006-04-24  Brian Matherly  <pez4brian@users.sourceforge.net>
 	* src/GrampsDisplay.py: make manual work in Windows
 
diff --git a/gramps2/src/GrampsDb/_GrampsBSDDB.py b/gramps2/src/GrampsDb/_GrampsBSDDB.py
index 0f60a98d5..c0d6e61bb 100644
--- a/gramps2/src/GrampsDb/_GrampsBSDDB.py
+++ b/gramps2/src/GrampsDb/_GrampsBSDDB.py
@@ -800,7 +800,6 @@ class GrampsBSDDB(GrampsDbBase):
     def close(self):
         if not self.db_is_open:
             return
-        self.name_group.close()
         if not self.readonly:
             self.metadata['bookmarks'] = self.bookmarks
             self.metadata['gender_stats'] = self.genderStats.save_stats()
@@ -808,7 +807,10 @@ class GrampsBSDDB(GrampsDbBase):
             self.metadata['pevent_names'] = list(self.individual_event_names)
             self.metadata['fattr_names'] = list(self.family_attributes)
             self.metadata['pattr_names'] = list(self.individual_attributes)
+        if self.UseTXN:
+            self.env.txn_checkpoint()
         self.metadata.close()
+        self.name_group.close()
         self.surnames.close()
         self.eventnames.close()
         self.repository_types.close()
@@ -832,8 +834,6 @@ class GrampsBSDDB(GrampsDbBase):
         self.source_map.close()
         self.media_map.close()
         self.event_map.close()
-        if self.UseTXN:
-            self.env.txn_checkpoint()
         self.env.close()
 
         if not self.readonly:
diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am
index 5c43a2aef..56038f297 100644
--- a/gramps2/src/Makefile.am
+++ b/gramps2/src/Makefile.am
@@ -83,7 +83,7 @@ gdir_PYTHON = \
 MOSTLYCLEANFILES = *pyc *pyo
 
 # Which modules to document
-docmodules = RelLib DateHandler GrampsDb
+docmodules = RelLib DateHandler GrampsDb BaseDoc
 
 pycheck: 
 	for d in $(SUBDIRS) ; do \