diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 69d14b8d3..c64a204b5 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-14  Eero Tamminen  <eerot@sf>
+	* src/ReadXML.py (start_event): Correctly set event type.
+
+2005-08-14  Alex Roitman  <shura@gramps-project.org>
+	* acinclude.m4, configure.in, gramps.spe.in, src/data/Makefile.am:
+	Properly test for gconftool-2 binary.
+
 2005-08-14  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/plugins/ExportVCalendar.py: Fix typo
 	
diff --git a/gramps2/acinclude.m4 b/gramps2/acinclude.m4
index 9f201a6df..dc761ec66 100644
--- a/gramps2/acinclude.m4
+++ b/gramps2/acinclude.m4
@@ -1,6 +1,6 @@
 dnl AM_GCONF2_REPLACEMENT
 dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to gconftool-2
+dnl  (i.e. pass to $GCONFTOOL
 dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
 dnl  you should install foo.schemas files
 dnl
@@ -10,7 +10,7 @@ dnl By copying it here we remove the requirement for having it on the system.
 AC_DEFUN([AM_GCONF2_REPLACEMENT],
 [
   if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    GCONF_SCHEMA_CONFIG_SOURCE=`$GCONFTOOL --get-default-source`
   else
     GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
   fi
diff --git a/gramps2/configure.in b/gramps2/configure.in
index d6885efd9..8c750df28 100644
--- a/gramps2/configure.in
+++ b/gramps2/configure.in
@@ -16,6 +16,12 @@ then
   VERSIONSTRING="$VERSION-$RELEASE"
 fi
 
+dnl Checking for gconftool-2
+AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+if test "x$GCONFTOOL" = xno; then
+  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+fi
+
 AM_GCONF2_REPLACEMENT
 AM_SHARED_MIME
 AM_PACKAGER
diff --git a/gramps2/gramps.spec.in b/gramps2/gramps.spec.in
index 61717cc42..f4655fdbf 100644
--- a/gramps2/gramps.spec.in
+++ b/gramps2/gramps.spec.in
@@ -86,8 +86,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mime/packages/gramps.xml
 
 %post
-GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \
-  gconftool-2 --makefile-install-rule \
+GCONF_CONFIG_SOURCE=`@GCONFTOOL@ --get-default-source` \
+  @GCONFTOOL@ --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/gramps.schemas > /dev/null
 /usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null
 /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null
diff --git a/gramps2/src/ReadXML.py b/gramps2/src/ReadXML.py
index 6fba5530b..46b1af9d8 100644
--- a/gramps2/src/ReadXML.py
+++ b/gramps2/src/ReadXML.py
@@ -596,10 +596,7 @@ class GrampsParser:
     def start_event(self,attrs):
         self.event = RelLib.Event()
         self.db.add_event(self.event,self.trans)
-        if self.family:
-            self.event_type = const.display_pevent(attrs["type"])
-        else:
-            self.event_type = const.display_fevent(attrs["type"])
+        self.event_type = const.save_event(attrs["type"])
         if attrs.has_key("conf"):
             self.event.conf = int(attrs["conf"])
         else:
diff --git a/gramps2/src/data/Makefile.am b/gramps2/src/data/Makefile.am
index 40697ccc3..a16e27223 100644
--- a/gramps2/src/data/Makefile.am
+++ b/gramps2/src/data/Makefile.am
@@ -40,12 +40,12 @@ if !PACKAGER_MODE
 if GCONF_SCHEMAS_INSTALL
 GCONF_SCHEMAS_INSTALLATION += \
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-		gconftool-2 --makefile-install-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas ;\
+		$(GCONFTOOL) --makefile-install-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas ;\
 	pkill gconfd ; echo Restarting gconfd
 
 GCONF_SCHEMAS_UNINSTALLATION += \
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-		gconftool-2 --makefile-uninstall-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas
+		$(GCONFTOOL) --makefile-uninstall-rule $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas
 endif
 if SHARED_MIME_INSTALL
 SHARED_MIME_INSTALLATION += \