diff --git a/gramps2/intltool-extract.in b/gramps2/intltool-extract.in
index fc39314c9..adfa97134 100644
--- a/gramps2/intltool-extract.in
+++ b/gramps2/intltool-extract.in
@@ -32,7 +32,7 @@
 ## Release information
 my $PROGRAM      = "intltool-extract";
 my $PACKAGE      = "intltool";
-my $VERSION      = "0.34.2";
+my $VERSION      = "0.34.1";
 
 ## Loaded modules
 use strict; 
@@ -485,12 +485,10 @@ sub parseTree
 sub intltool_tree_comment
 {
     my $expat = shift;
-    my $data  = $expat->original_string();
+    my $data  = shift;
     my $clist = $expat->{Curlist};
     my $pos   = $#$clist;
 
-    $data =~ s/^<!--//s;
-    $data =~ s/-->$//s;
     push @$clist, 1 => $data;
 }
 
diff --git a/gramps2/intltool-merge.in b/gramps2/intltool-merge.in
index e50cfb3ac..9b3a539d8 100644
--- a/gramps2/intltool-merge.in
+++ b/gramps2/intltool-merge.in
@@ -35,7 +35,7 @@
 ## Release information
 my $PROGRAM = "intltool-merge";
 my $PACKAGE = "intltool";
-my $VERSION = "0.34.2";
+my $VERSION = "0.34.1";
 
 ## Loaded modules
 use strict; 
@@ -91,7 +91,7 @@ my $OUTFILE;
 
 my %po_files_by_lang = ();
 my %translations = ();
-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
+my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "/usr/bin/iconv";
 my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
 
 # Use this instead of \w for XML files to handle more possible characters.
@@ -257,7 +257,7 @@ sub gather_po_files
 sub get_local_charset
 {
     my ($encoding) = @_;
-    my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "@INTLTOOL_LIBDIR@/charset.alias";
+    my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/usr/lib/charset.alias";
 
     # seek character encoding aliases in charset.alias (glib)
 
diff --git a/gramps2/intltool-update.in b/gramps2/intltool-update.in
index 30de888b7..f251956ca 100644
--- a/gramps2/intltool-update.in
+++ b/gramps2/intltool-update.in
@@ -30,7 +30,7 @@
 
 ## Release information
 my $PROGRAM = "intltool-update";
-my $VERSION = "0.34.2";
+my $VERSION = "0.34.1";
 my $PACKAGE = "intltool";
 
 ## Loaded modules
@@ -80,8 +80,7 @@ my $ini_support =
 "directory(?:\\.in)+|".	# http://www.freedesktop.org/Standards/menu-spec
 "soundlist(?:\\.in)+|".	# GNOME specific
 "keys(?:\\.in)+|".	# GNOME Mime database specific
-"theme(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
-"service(?:\\.in)+";    # DBus specific
+"theme(?:\\.in)+";	# http://www.freedesktop.org/Standards/icon-theme-spec
 
 my $buildin_gettext_support = 
 "c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py";
@@ -611,7 +610,7 @@ sub GenerateHeaders
 #
 sub GeneratePOTemplate
 {
-    my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
+    my $XGETTEXT = $ENV{"XGETTEXT"} || "/usr/bin/xgettext";
     my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
     chomp $XGETTEXT;
 
@@ -782,7 +781,7 @@ sub POFile_Update
 {
     -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
 
-    my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
+    my $MSGMERGE = $ENV{"MSGMERGE"} || "/usr/bin/msgmerge";
     my ($lang, $outfile) = @_;
 
     print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
@@ -825,7 +824,7 @@ sub POFile_GetLanguage ($)
 sub Console_Write_TranslationStatus
 {
     my ($lang, $output_file) = @_;
-    my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
+    my $MSGFMT = $ENV{"MSGFMT"} || "/usr/bin/msgfmt";
 
     $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
 
@@ -834,7 +833,7 @@ sub Console_Write_TranslationStatus
 
 sub Console_Write_CoverageReport
 {
-    my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
+    my $MSGFMT = $ENV{"MSGFMT"} || "/usr/bin/msgfmt";
 
     &GatherPOFiles;
 
@@ -992,9 +991,9 @@ sub FindPackageName
 	($name, $version) = ($1, $2);
 	$name    =~ s/[\[\]\s]//g;
 	$version =~ s/[\[\]\s]//g;
-	$varhash{"PACKAGE_NAME"} = $name;
+	$varhash{"AC_PACKAGE_NAME"} = $name;
 	$varhash{"PACKAGE"} = $name;
-	$varhash{"PACKAGE_VERSION"} = $version;
+	$varhash{"AC_PACKAGE_VERSION"} = $version;
 	$varhash{"VERSION"} = $version;
     }
     
@@ -1003,18 +1002,19 @@ sub FindPackageName
 	($name, $version) = ($1, $2);
 	$name    =~ s/[\[\]\s]//g;
 	$version =~ s/[\[\]\s]//g;
-	$varhash{"PACKAGE_NAME"} = $name;
+	$varhash{"AC_PACKAGE_NAME"} = $name;
 	$varhash{"PACKAGE"} = $name;
-	$varhash{"PACKAGE_VERSION"} = $version;
+	$varhash{"AC_PACKAGE_VERSION"} = $version;
 	$varhash{"VERSION"} = $version;
     }
 
     # \s makes this not work, why?
     $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m;
     
-    # m4 macros AC_PACKAGE_NAME, AC_PACKAGE_VERSION etc. have same value
-    # as corresponding $PACKAGE_NAME, $PACKAGE_VERSION etc. shell variables.
-    $name =~ s/\bAC_PACKAGE_/\$PACKAGE_/g;
+    # prepend '$' to auto* internal variables, usually they are
+    # used in configure.in/ac without the '$'
+    $name =~ s/AC_/\$AC_/g;
+    $name =~ s/\$\$/\$/g;
 
     $name = $domain if $domain;
 
diff --git a/gramps2/src/DataViews/_FamilyList.py b/gramps2/src/DataViews/_FamilyList.py
index 227305fbf..d9404bbb6 100644
--- a/gramps2/src/DataViews/_FamilyList.py
+++ b/gramps2/src/DataViews/_FamilyList.py
@@ -158,10 +158,10 @@ class FamilyListView(PageView.ListView):
         import GrampsDb
         
         mlist = []
-        self.selection.selected_foreach(self.blist,mlist)
+        self.selection.selected_foreach(self.blist, mlist)
 
         for handle in mlist:
-            GrampsDb.remove_family_relationships(handle)
+            GrampsDb.remove_family_relationships(self.dbstate.db, handle)
         self.build_tree()
     
     def edit(self,obj):
diff --git a/gramps2/src/GrampsDb/_DbUtils.py b/gramps2/src/GrampsDb/_DbUtils.py
index 0463926fd..7a58a5960 100644
--- a/gramps2/src/GrampsDb/_DbUtils.py
+++ b/gramps2/src/GrampsDb/_DbUtils.py
@@ -22,7 +22,7 @@
 
 
 def remove_family_relationships(db, family_handle, trans=None):
-    family = db.get_family_from_handle(handle)
+    family = db.get_family_from_handle(family_handle)
 
     if trans == None:
         need_commit = True
@@ -34,18 +34,18 @@ def remove_family_relationships(db, family_handle, trans=None):
                      family.get_mother_handle()]:
         if phandle:
             person = db.get_person_from_handle(phandle)
-            person.remove_family_handle(handle)
-            db.commit_person(person,trans)
+            person.remove_family_handle(family_handle)
+            db.commit_person(person, trans)
 
     for phandle in family.get_child_handle_list():
         person = db.get_person_from_handle(phandle)
-        person.remove_parent_family_handle(handle)
-        db.commit_person(person,trans)
+        person.remove_parent_family_handle(family_handle)
+        db.commit_person(person, trans)
 
-    db.remove_family(handle,trans)
+    db.remove_family(family_handle, trans)
     
     if need_commit:
-        db.transaction_commit(trans,_("Remove Family"))
+        db.transaction_commit(trans, _("Remove Family"))
 
 def remove_parent_from_family(db, person_handle, family_handle, trans=None):
     """