diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog
index dc3715f09d..f9856ebd84 100644
--- a/c/src/lib/libbsp/arm/edb7312/ChangeLog
+++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02	Jay Monkman
+
+	* 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/edb7312/irq/bsp_irq_init.c b/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c
index c8c3c7154f..43c2f63dc1 100644
--- a/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c
+++ b/c/src/lib/libbsp/arm/edb7312/irq/bsp_irq_init.c
@@ -22,6 +22,15 @@ extern void default_int_handler();
 void BSP_rtems_irq_mngt_init()
 {
 	long int_stat;
+        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);
+        }
 
 	/* mask all interrupts */
 	*EP7312_INTMR1 = 0x0;