diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
index ea785d4500..c30436d83a 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-05	Till Straumann <strauman@slac.stanford.edu>
+
+	* irq/ipic.c, irq/irq_init.c:
+	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/gen83xx/irq/ipic.c b/c/src/lib/libbsp/powerpc/gen83xx/irq/ipic.c
index 8433c32a67..ca782d4f9d 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/irq/ipic.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/irq/ipic.c
@@ -240,12 +240,12 @@ rtems_status_code BSP_irq_handle_at_ipic(uint32_t excNum)
     vecnum = MPC83xx_VCR_TO_VEC(mpc83xx.ipic.sivcr);
     msr_enable = PPC_MSR_EE;
     break;
-  case ASM_SYSMGMT_VECTOR:
+  case ASM_60X_SYSMGMT_VECTOR:
     vecnum = MPC83xx_VCR_TO_VEC(mpc83xx.ipic.smvcr);
     msr_enable = PPC_MSR_EE;
     break;
-#if defined(ASM_CRIT_VECTOR)
-  case ASM_CRIT_VECTOR:
+#if defined(ASM_BOOKE_CRIT_VECTOR)
+  case ASM_BOOKE_CRIT_VECTOR:
     vecnum = MPC83xx_VCR_TO_VEC(mpc83xx.ipic.scvcr);
     break;
 #endif
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/irq/irq_init.c b/c/src/lib/libbsp/powerpc/gen83xx/irq/irq_init.c
index 6cc2000ab7..86ef3a0e20 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/irq/irq_init.c
@@ -109,9 +109,9 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum)
     
     break;
 #if 0 /* Critical interrupts not yet supported */
-  case ASM_CRIT_VECTOR:
+  case ASM_BOOKE_CRIT_VECTOR:
 #endif
-  case ASM_SYSMGMT_VECTOR:
+  case ASM_60X_SYSMGMT_VECTOR:
   case ASM_EXT_VECTOR:
     BSP_irq_handle_at_ipic(excNum);
     break;
@@ -323,9 +323,9 @@ static rtems_raw_except_connect_data BSP_vec_desc[] = {
    exception_always_enabled
   },
 #endif
-#if defined(ASM_SYSMGMT_VECTOR) 
-  {ASM_SYSMGMT_VECTOR,
-   {ASM_SYSMGMT_VECTOR,
+#if defined(ASM_60X_SYSMGMT_VECTOR) 
+  {ASM_60X_SYSMGMT_VECTOR,
+   {ASM_60X_SYSMGMT_VECTOR,
     sysmgmt_exception_vector_prolog_code,
     (size_t)sysmgmt_exception_vector_prolog_code_size
    },
@@ -344,8 +344,8 @@ static rtems_raw_except_connect_data BSP_vec_desc[] = {
    exception_always_enabled
   }
 #if 0 /* Critical interrupts not yet supported */
-  ,{ASM_CRIT_VECTOR,
-   {ASM_CRIT_VECTOR,
+  ,{ASM_BOOKE_CRIT_VECTOR,
+   {ASM_BOOKE_CRIT_VECTOR,
     critical_exception_vector_prolog_code,
     critical_exception_vector_prolog_code_size
    }