diff --git a/c/src/lib/libbsp/arm/gba/ChangeLog b/c/src/lib/libbsp/arm/gba/ChangeLog
index a1d4cfe7c5..fa3bb18929 100644
--- a/c/src/lib/libbsp/arm/gba/ChangeLog
+++ b/c/src/lib/libbsp/arm/gba/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02	Jay Monkman <jtm@lopingdog.com>
+
+	* irq/bsp_irq_init.c: Changed interrupt handling
+	to use shared rtems_irq_connect_data struct.
+
 2006-01-11	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Add preinstall.am.
diff --git a/c/src/lib/libbsp/arm/gba/irq/bsp_irq_init.c b/c/src/lib/libbsp/arm/gba/irq/bsp_irq_init.c
index 5825e6d651..b47fbbbdd4 100644
--- a/c/src/lib/libbsp/arm/gba/irq/bsp_irq_init.c
+++ b/c/src/lib/libbsp/arm/gba/irq/bsp_irq_init.c
@@ -29,6 +29,16 @@
  */
 void BSP_rtems_irq_mngt_init(void)
 {
+  long *vectorTable;
+  int i;
+
+  vectorTable = (long *) VECTOR_TABLE;
+    
+  /* Initialize the vector table contents with default handler */
+  for (i=0; i<BSP_MAX_INT; i++) {
+      *(vectorTable + i) = (long)(default_int_handler);
+  }
+
   /* clear all interrupt status flags */
   GBA_REG_IF = 0xffff;
   /* disable all interrupts */