diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
index 2b0480008b..3a05d06269 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-05	Till Straumann <strauman@slac.stanford.edu>
+
+	* irq/irq_init.c, irq_asm.S:
+	Converted exception vector names to new ones
+	(qualified by <cpu_type> if non-std ppc exceptions).
+
 2007-12-04	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* startup/bspstart.c: Move interrupt_stack_size field from CPU Table to
diff --git a/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c b/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c
index 5f2d71d3be..62fd0336e1 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/irq/irq.c
@@ -654,7 +654,7 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum)
 
       return;
 
-    case ASM_SYSMGMT_VECTOR:
+    case ASM_60X_SYSMGMT_VECTOR:
 
       /* get the content of main interrupt status register */
       pmce =  mpc5200.pmce;
diff --git a/c/src/lib/libbsp/powerpc/gen5200/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/gen5200/irq/irq_asm.S
index 61b032fdf3..17ff444720 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/irq/irq_asm.S
+++ b/c/src/lib/libbsp/powerpc/gen5200/irq/irq_asm.S
@@ -126,7 +126,7 @@ SYM (system_management_exception_vector_prolog_code):
 	 */
 	stwu    r1, - (EXCEPTION_FRAME_END)(r1)
 	stw	r4, GPR4_OFFSET(r1)
-	li	r4, ASM_SYSMGMT_VECTOR
+	li	r4, ASM_60X_SYSMGMT_VECTOR
 	ba	shared_raw_irq_code_entry
 
 	PUBLIC_VAR (system_management_exception_vector_prolog_code_size)
diff --git a/c/src/lib/libbsp/powerpc/gen5200/irq/irq_init.c b/c/src/lib/libbsp/powerpc/gen5200/irq/irq_init.c
index ba2abda338..e774803675 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/irq/irq_init.c
@@ -288,8 +288,8 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
     BSP_panic("Unable to initialize RTEMS external raw exception\n");
     }
 
-  vectorDesc.exceptIndex	   = ASM_SYSMGMT_VECTOR;
-  vectorDesc.hdl.vector        = ASM_SYSMGMT_VECTOR;
+  vectorDesc.exceptIndex	   = ASM_60X_SYSMGMT_VECTOR;
+  vectorDesc.hdl.vector        = ASM_60X_SYSMGMT_VECTOR;
   vectorDesc.hdl.raw_hdl       = system_management_exception_vector_prolog_code;
   vectorDesc.hdl.raw_hdl_size  = (unsigned) &system_management_exception_vector_prolog_code_size;