diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog
index c33fc3b6f0..9b1b30bc95 100644
--- a/c/src/lib/libbsp/powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-29	Till Straumann <strauman@slac.stanford.edu>
+	* shared/irq/irq.c: Fixed incorrect removal of first shared
+        interrupt in chain.
+
 2005-11-09	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* shared/startup/bspstart.c: Eliminate obsolete types.
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq.c b/c/src/lib/libbsp/powerpc/shared/irq/irq.c
index 40e8d848fa..be57fcb09f 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq.c
@@ -275,6 +275,7 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
           /* first handler isn't malloc'ed, so just overwrite it.  Since
           the contents of vchain are being struct copied, vchain itself
           goes away */
+          vchain = vchain->next_handler;
           rtems_hdl_tbl[irq->name]= *vchain;
        }
        free(vchain);