diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 3d7045f8c..0a3c3d4d8 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-24  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
+	* src/GrampsBSDDB.py (upgrade): Disable upgrade_7 until this is
+	properly working to not accidently destroy a database from gramps20
+
 2005-06-20  Don Allingham  <don@gramps-project.org>
 	* src/GenericFilter.py: optimize looping and reducing fetches
 	* src/Utils.py: fix event handle accesses
diff --git a/gramps2/src/GrampsBSDDB.py b/gramps2/src/GrampsBSDDB.py
index bb7271313..7c553db24 100644
--- a/gramps2/src/GrampsBSDDB.py
+++ b/gramps2/src/GrampsBSDDB.py
@@ -516,10 +516,12 @@ class GrampsBSDDB(GrampsDbBase):
             self.upgrade_5()
         if version < 6:
             self.upgrade_6()
-        if version < 7:
-            self.upgrade_7()
         self.metadata['version'] = _DBVERSION
-        print 'Successfully finished all upgrades'
+        if version < 7:
+            #self.upgrade_7()
+            raise Exception("Currently there is no database upgrade available")
+        else:
+            print 'Successfully finished all upgrades'
 
     def upgrade_2(self,child_rel_notrans):
         print "Upgrading to DB version 2"