diff --git a/ChangeLog b/ChangeLog
index e8ad00471..92ee19a5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-02  Don Allingham  <don@gramps-project.org>
+	* src/Config/_GrampsConfigKeys.py: add family-warn back in
+	* data/gramps.schemas.in: add family-warn back in
+	
 2006-05-02  Alex Roitman  <shura@gramps-project.org>
 	* src/RelLib/_BaseObject.py (PrivacyBase): Remove class, as it
 	already has its own module.
diff --git a/data/gramps.schemas.in b/data/gramps.schemas.in
index d7107c36e..fac559c75 100644
--- a/data/gramps.schemas.in
+++ b/data/gramps.schemas.in
@@ -15,6 +15,18 @@
         </locale>
       </schema>
 
+      <schema>
+        <key>/schemas/apps/gramps/preferences/family-warn</key>
+        <applyto>/apps/gramps/preferences/family-warn</applyto>
+        <owner>gramps</owner>
+        <type>bool</type>
+        <default>1</default>
+        <locale name="C">
+          <short>Warn when adding parents in a way that may cause duplicate families.</short>
+          <long>If set to True, a warning dialog will be displayed whenever the user is a risk of creating a duplicate family when adding parents to a person.</long>
+        </locale>
+      </schema>
+
       <schema>
         <key>/schemas/apps/gramps/preferences/last-view</key>
         <applyto>/apps/gramps/preferences/last-view</applyto>
diff --git a/src/Config/_GrampsConfigKeys.py b/src/Config/_GrampsConfigKeys.py
index 2de15ce55..637225f8a 100644
--- a/src/Config/_GrampsConfigKeys.py
+++ b/src/Config/_GrampsConfigKeys.py
@@ -1,4 +1,5 @@
 FAMILY_DETAILS       = ('preferences','family-details', 0)
+FAMILY_WARN          = ('preferences','family-warn', 0)
 LAST_VIEW            = ('preferences','last-view', 1)
 FAMILY_SIBLINGS      = ('preferences','family-siblings', 0)
 AUTOLOAD             = ('behavior','autoload', 0)
@@ -47,6 +48,7 @@ WEBSITE_DIRECTORY    = ('paths','website-directory', 2)
 
 default_value = {
     FAMILY_DETAILS       : True,
+    FAMILY_WARN          : True,
     LAST_VIEW            : 0,
     FAMILY_SIBLINGS      : True,
     AUTOLOAD             : False,