diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 8960571d19..996e389d33 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-10	Till Straumann <strauman@slac.stanford.edu>
+
+	* new-exceptions/raw_exception.c, new_exceptions/raw_exception.h,
+	new_exceptions/bspsupport/irq.c: renamed ASM_BOOKE_PIT_VECTOR
+	to ASM_BOOKE_DEC_VECTOR to be closer to 'official'
+	nomenclature.
+
 2007-12-10	Till Straumann <strauman@slac.stanford.edu>
 
 	* new-exceptions/bspsupport/ppc_exc_test.c: fixed
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c
index 154e55a82b..ed73936ecc 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c
+++ b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/irq.c
@@ -360,7 +360,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
 				 * We do this so that existing DEC handlers can be used
 				 * with minor modifications.
 				 */
-				ppc_exc_set_handler(ASM_BOOKE_PIT_VECTOR, C_dispatch_dec_handler_bookE);
+				ppc_exc_set_handler(ASM_BOOKE_DEC_VECTOR, C_dispatch_dec_handler_bookE);
 			} else {
 				ppc_exc_set_handler(ASM_DEC_VECTOR, C_dispatch_irq_handler);
 			}
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c b/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c
index 01dec9d342..a7055d6cca 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c
+++ b/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c
@@ -155,7 +155,7 @@ static cat_ini_t mpc_5xx_vector_categories[LAST_VALID_EXC + 1] = {
 
 static cat_ini_t ppc_405_vector_categories[LAST_VALID_EXC + 1] = {
   [ ASM_EXT_VECTOR             ] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
-  [ ASM_BOOKE_PIT_VECTOR       ] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
+  [ ASM_BOOKE_DEC_VECTOR       ] = PPC_EXC_CLASSIC | PPC_EXC_ASYNC,
 
   [ ASM_PROT_VECTOR            ] = PPC_EXC_CLASSIC,
   [ ASM_ISI_VECTOR             ] = PPC_EXC_CLASSIC,
@@ -255,8 +255,7 @@ static cat_ini_t e500_vector_categories[LAST_VALID_EXC + 1] = {
   [ ASM_TRACE_VECTOR                ] = PPC_EXC_BOOKE_CRITICAL,
 
   [ ASM_EXT_VECTOR                  ] = PPC_EXC_CLASSIC        | PPC_EXC_ASYNC,
-  /* FIXME: should eventually go to the PIT vector + cleanup clock driver */
-  [ ASM_DEC_VECTOR                  ] = PPC_EXC_CLASSIC        | PPC_EXC_ASYNC,
+  [ ASM_BOOKE_DEC_VECTOR            ] = PPC_EXC_CLASSIC        | PPC_EXC_ASYNC,
   [ ASM_BOOKE_FIT_VECTOR            ] = PPC_EXC_CLASSIC        | PPC_EXC_ASYNC,
 
   [ ASM_PROT_VECTOR                 ] = PPC_EXC_CLASSIC,
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.h b/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.h
index f0d8836da1..8015db0136 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.h
+++ b/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.h
@@ -48,7 +48,12 @@
 #define	ASM_TRACE_VECTOR		             0x0D
 
 #define	ASM_BOOKE_CRIT_VECTOR	             0x01
-#define	ASM_BOOKE_PIT_VECTOR	             0x10
+/* We could use the std. decrementer vector # on bookE, too,
+ * but the bookE decrementer has slightly different semantics
+ * so we use a different vector (which happens to be
+ * the PIT vector on the 405 which is like the booke decrementer)
+ */
+#define	ASM_BOOKE_DEC_VECTOR	             0x10
 #define	ASM_BOOKE_ITLBMISS_VECTOR            0x11
 #define	ASM_BOOKE_DTLBMISS_VECTOR            0x12
 #define	ASM_BOOKE_FIT_VECTOR                 0x13