diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 2213f47588..1db3326dab 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-05	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* new-exceptions/raw_exception.c: Conditionalize some BOOKE vectors.
+
 2007-12-05	Till Straumann <strauman@slac.stanford.edu>
 
 	* new-exceptions/raw_exception.c, new-exceptions/raw_exception.h:
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 d1afb6e908..8d77fd14d7 100644
--- a/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c
+++ b/c/src/lib/libcpu/powerpc/new-exceptions/raw_exception.c
@@ -338,16 +338,24 @@ ppc_raw_exception_category rval = PPC_EXC_INVALID;
 	case ASM_MACH_VECTOR:
 		return PPC_EXC_E500_MACHCHK;
 
+#if defined(ASM_BOOKE_CRIT_VECTOR)
 	case ASM_BOOKE_CRIT_VECTOR:
+#endif
+#if defined(ASM_BOOKE_WDOG_VECTOR)
 	case ASM_BOOKE_WDOG_VECTOR:
+#endif
+#if defined(ASM_BOOKE_CRIT_VECTOR) || defined(ASM_BOOKE_WDOG_VECTOR)
 		rval |= PPC_EXC_ASYNC;
 		/* fall thru */
+#endif
 	case ASM_TRACE_VECTOR:
 		return rval | PPC_EXC_BOOKE_CRITICAL;
 
 	case ASM_EXT_VECTOR:
 	case ASM_DEC_VECTOR:
+#if defined(ASM_BOOKE_CRIT_VECTOR)
 	case ASM_BOOKE_FIT_VECTOR:
+#endif
 		rval |= PPC_EXC_ASYNC;
 
 		/* fall thru */