--- dia-0.94/app/commands.c.help	2004-08-16 03:56:03.000000000 -0400
+++ dia-0.94/app/commands.c	2004-09-03 10:29:38.315355000 -0400
@@ -524,7 +524,7 @@
   const char *dentry;
   GError *error = NULL;
 
-  helpdir = dia_get_data_directory("help");
+  helpdir = g_strdup ("/usr/share/gnome/help/dia");
   if (!helpdir) {
     message_warning(_("Could not find help directory"));
     return;
@@ -552,11 +552,11 @@
 			      G_DIR_SEPARATOR_S "dia-manual.chm", NULL);
       if (!g_file_test(helpindex, G_FILE_TEST_EXISTS)) {
 	helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
-			      G_DIR_SEPARATOR_S "index.html", NULL);
+			      G_DIR_SEPARATOR_S "dia.xml", NULL);
       }
       #else
       helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
-			      G_DIR_SEPARATOR_S "index.html", NULL);
+			      G_DIR_SEPARATOR_S "dia.xml", NULL);
       #endif
       bestscore = score;
     }
@@ -573,7 +573,7 @@
   ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL);
 #else
   command = getenv("BROWSER");
-  command = g_strdup_printf("%s 'file://%s' &", command ? command : "netscape", helpindex);
+  command = g_strdup_printf("%s '%s' &", command ? command : "yelp", helpindex);
   system(command);
   g_free(command);
 #endif
--- dia-0.94/doc/en/Makefile.am.help	2004-08-16 03:56:07.000000000 -0400
+++ dia-0.94/doc/en/Makefile.am	2004-09-03 09:54:36.957260000 -0400
@@ -2,16 +2,8 @@
 docname=dia
 lang=en
 omffile=
-entities=
-
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
-
-EXTRA_DIST += \
-	dia.1 \
-	dia.dbk \
+entities= \
 	authors.xml \
-	dia.xml \
 	entities.xml \
 	intro.xml \
 	license.xml \
@@ -23,7 +15,15 @@
 	usage-objects-selecting.xml \
 	usage-objects-special.xml \
 	usage-objects.xml \
-	usage-quickstart.xml \
+	usage-quickstart.xml
+
+include $(top_srcdir)/xmldocs.make
+dist-hook: app-dist-hook
+
+EXTRA_DIST += \
+	dia.1 \
+	dia.dbk \
+	dia.xml \
 	graphics/line_props.png \
 	graphics/home_network.png \
 	graphics/line_icon.png \
--- dia-0.94/doc/en/dia.xml.help	2004-09-03 09:54:36.923294000 -0400
+++ dia-0.94/doc/en/dia.xml	2004-09-03 09:54:36.963253000 -0400
@@ -5,7 +5,7 @@
 <!DOCTYPE book
 
   PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
   [
 
     <!ENTITY VERSION "0.94">