diff --git a/ChangeLog b/ChangeLog
index b12439f6e4..3d384d83f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
+2001-06-26  Dave Peticolas  <dave@krondo.com>
+
+	* src/gnome/gnc-html.c: don't handle keypresses, let the gtkhtml
+	object do it.
+
 2001-06-25  Dave Peticolas  <dave@krondo.com>
 
+	* src/engine/sql/kvp-sql.c: include gnc-engine-util.h for stpcpy
+
+	* src/engine/gnc-engine-util.c (gnc_stpcpy): add func
+
+	* src/engine/gnc-engine-util.h: add definition of gnc_stpcpy.
+	if stpcpy is not available, define stpcpy as gnc_stpcpy.
+
+	* src/gnc-ui-util.c: remove gnc_stpcpy
+
 	* src/gnome/window-main-summarybar.c: fix bug in euro profit
 	calculation. use share prices in calculating totals.
 
diff --git a/src/engine/gnc-engine-util.c b/src/engine/gnc-engine-util.c
index b6a7566f10..125adf1236 100644
--- a/src/engine/gnc-engine-util.c
+++ b/src/engine/gnc-engine-util.c
@@ -279,6 +279,17 @@ gnc_strisnum(const char *s)
   return FALSE;
 }
 
+/********************************************************************\
+ * our own version of stpcpy
+\********************************************************************/
+
+char *
+gnc_stpcpy (char *dest, const char *src)
+{
+  strcpy (dest, src);
+  return (dest + strlen (src));
+}
+
 /********************************************************************\
   See header for docs.
 \********************************************************************/
diff --git a/src/engine/gnc-engine-util.h b/src/engine/gnc-engine-util.h
index 7dcc601a9d..b9f4bdf033 100644
--- a/src/engine/gnc-engine-util.h
+++ b/src/engine/gnc-engine-util.h
@@ -27,7 +27,9 @@
 #ifndef __GNC_ENGINE_UTIL_H__
 #define __GNC_ENGINE_UTIL_H__
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <assert.h>
 #include <errno.h>
@@ -211,6 +213,13 @@ char * ultostr (unsigned long val, int base);
  * whitespace. */
 gboolean gnc_strisnum(const char *s);
 
+/* Define a gnucash stpcpy */
+char * gnc_stpcpy (char *dest, const char *src);
+
+#ifndef HAVE_STPCPY
+#define stpcpy gnc_stpcpy
+#endif
+
 
 /***********************************************************************\
 
diff --git a/src/engine/sql/kvp-sql.c b/src/engine/sql/kvp-sql.c
index c431e55a12..dcc7ffe666 100644
--- a/src/engine/sql/kvp-sql.c
+++ b/src/engine/sql/kvp-sql.c
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "gnc-engine-util.h"
 #include "kvp-sql.h"
 #include "PostgresBackend.h"
 #include "putil.h"
diff --git a/src/gnc-ui-util.c b/src/gnc-ui-util.c
index e8168dd37c..bf8cee168d 100644
--- a/src/gnc-ui-util.c
+++ b/src/gnc-ui-util.c
@@ -765,15 +765,6 @@ gnc_pop_locale (void)
   g_free (saved_locale);
 }
 
-
-static char *
-gnc_stpcpy (char *dest, const char *src)
-{
-   strcpy(dest, src);
-   return(dest + strlen(src));
-}
-
-
 GNCPrintAmountInfo
 gnc_default_print_info (gboolean use_symbol)
 {
diff --git a/src/gnome/gnc-html.c b/src/gnome/gnc-html.c
index abe1efef28..2242fc909b 100644
--- a/src/gnome/gnc-html.c
+++ b/src/gnome/gnc-html.c
@@ -721,71 +721,6 @@ gnc_html_set_base_cb(GtkHTML * gtkhtml, const gchar * base,
 }
 
 
-/********************************************************************
- * gnc_html_key_cb
- ********************************************************************/
-
-static gboolean
-gnc_html_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) {
-  gnc_html * hw = (gnc_html *) data;
-  
-  GtkAdjustment * vadj = 
-    gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(hw->container));
-  GtkAdjustment * hadj = 
-    gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(hw->container));
-  
-  gfloat        v_value = vadj->value;
-  gfloat        h_value = hadj->value;
-
-  switch (event->keyval)
-  {
-    case GDK_KP_Left:
-    case GDK_Left:
-      h_value -= hadj->step_increment;
-      break;
-    case GDK_KP_Right:
-    case GDK_Right:
-      h_value += hadj->step_increment;
-      break;
-    case GDK_KP_Up:
-    case GDK_Up:
-      v_value -= vadj->step_increment;
-      break;
-    case GDK_KP_Down:
-    case GDK_Down:
-      v_value += vadj->step_increment;
-      break;
-    case GDK_KP_Page_Up:
-    case GDK_Page_Up:
-      v_value -= vadj->page_increment;
-      break;
-    case GDK_KP_Page_Down:
-    case GDK_Page_Down:
-    case GDK_space:
-      v_value += vadj->page_increment;
-      break;
-    case GDK_KP_Home:
-    case GDK_Home:
-      v_value = vadj->lower;
-      break;
-    case GDK_KP_End:
-    case GDK_End:
-      v_value = vadj->upper;
-      break;
-    default:
-      return FALSE;
-  }
-
-  v_value = CLAMP(v_value, vadj->lower, vadj->upper - vadj->page_size);
-  h_value = CLAMP(h_value, hadj->lower, hadj->upper - hadj->page_size);
-
-  gtk_adjustment_set_value(vadj, v_value);
-  gtk_adjustment_set_value(hadj, h_value);
-
-  return TRUE;
-}
-
-
 /********************************************************************
  * gnc_html_button_press_cb
  * mouse button callback (if any)
@@ -1315,10 +1250,7 @@ gnc_html_new(void) {
   gtk_signal_connect (GTK_OBJECT (retval->html), "button_press_event",
                       GTK_SIGNAL_FUNC (gnc_html_button_press_cb), 
                       (gpointer)retval);
-  
-  gtk_signal_connect (GTK_OBJECT(retval->html), "key_press_event", 
-                      GTK_SIGNAL_FUNC(gnc_html_key_cb), (gpointer)retval);
-  
+
   gtk_signal_connect (GTK_OBJECT(retval->html), "submit", 
                       GTK_SIGNAL_FUNC(gnc_html_submit_cb), (gpointer)retval);