diff --git a/ChangeLog b/ChangeLog
index b333d41d3c..7339092a42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-17  Derek Atkins <derek@ihtfp.com>
+
+	* configure.in: don't set pkglibdir
+	* lib/goffice/split.c: implement e_xml_get_child_by_name()
+	  GOG branch now builds on FC3.
+
 2005-02-12  Joshua Sled  <jsled@asynchronous.org>
 
 	* src/report/utility-reports/test-graphing.scm: Add to make
diff --git a/configure.in b/configure.in
index 295e54e792..8605f244c0 100644
--- a/configure.in
+++ b/configure.in
@@ -389,7 +389,7 @@ gog_plugindir='${GNC_LIBDIR}/plugins'
 gnumeric_plugindir='${gog_plugindir}'
 AC_SUBST(gog_plugindir)
 AC_SUBST(gnumeric_plugindir)
-AC_SUBST(pkglibdir)
+#AC_SUBST(pkglibdir) -- this breaks builds into /opt.
 gnumeric_icondir='${GNC_SHAREDIR}/pixmaps'
 AC_SUBST(gnumeric_icondir)
 
diff --git a/lib/goffice/split.c b/lib/goffice/split.c
index e0334f00fc..5b2436afec 100644
--- a/lib/goffice/split.c
+++ b/lib/goffice/split.c
@@ -226,6 +226,22 @@ xml_node_get_int (xmlNodePtr node, char const *name, int *val)
 	return (CXML2C (buf) != end) && (errno != ERANGE);
 }
 
+xmlNode *
+e_xml_get_child_by_name (xmlNode const *parent, char const *child_name)
+{
+	xmlNode *child;
+
+	g_return_val_if_fail (parent != NULL, NULL);
+	g_return_val_if_fail (child_name != NULL, NULL);
+
+	for (child = parent->xmlChildrenNode; child != NULL; child = child->next) {
+		if (xmlStrcmp (child->name, child_name) == 0) {
+			return child;
+		}
+	}
+	return NULL;
+}
+
 xmlNode *
 e_xml_get_child_by_name_no_lang (xmlNode const *parent, char const *name)
 {