diff --git a/c/src/exec/score/ChangeLog b/c/src/exec/score/ChangeLog
index d1f4e7fdb1..37642e1706 100644
--- a/c/src/exec/score/ChangeLog
+++ b/c/src/exec/score/ChangeLog
@@ -1,4 +1,9 @@
 
+2000-09-25	Joel Sherrill <joel@OARcorp.com>
+
+	* rtems/system.h: Switched a29k and hppa1.1 to using cpuopts.h not
+	targopts.h to reduce dependency on BSP.
+
 2000-09-20	Joel Sherrill <joel@OARcorp.com>
 
 	* src/objectgetbyindex.c: Do not enable dispatching on an
diff --git a/c/src/exec/score/include/rtems/system.h b/c/src/exec/score/include/rtems/system.h
index b2f5690594..55eca15c61 100644
--- a/c/src/exec/score/include/rtems/system.h
+++ b/c/src/exec/score/include/rtems/system.h
@@ -30,7 +30,9 @@ extern "C" {
 /*
  * FIXME: cpuopts.h should be included here.
  */
-#if defined(__h8300__) \
+#if defined(_AM29K) \
+  || defined(__hppa__) \
+  || defined(__h8300__) \
   || defined(__i960__) \
   || defined(__mc68000__) \
   || defined(__sh__) \
@@ -39,7 +41,7 @@ extern "C" {
   /* these cpus are ready to apply cpuopts.h */
 #include <rtems/score/cpuopts.h>
 #else
-  /* fallback to targopts.h for hppa1.1, mips, and powerpc */
+  /* fallback to targopts.h for mips and powerpc */
 #include <rtems/score/targopts.h>
 #endif
 
diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog
index d1f4e7fdb1..37642e1706 100644
--- a/cpukit/score/ChangeLog
+++ b/cpukit/score/ChangeLog
@@ -1,4 +1,9 @@
 
+2000-09-25	Joel Sherrill <joel@OARcorp.com>
+
+	* rtems/system.h: Switched a29k and hppa1.1 to using cpuopts.h not
+	targopts.h to reduce dependency on BSP.
+
 2000-09-20	Joel Sherrill <joel@OARcorp.com>
 
 	* src/objectgetbyindex.c: Do not enable dispatching on an
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
index b2f5690594..55eca15c61 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/score/include/rtems/system.h
@@ -30,7 +30,9 @@ extern "C" {
 /*
  * FIXME: cpuopts.h should be included here.
  */
-#if defined(__h8300__) \
+#if defined(_AM29K) \
+  || defined(__hppa__) \
+  || defined(__h8300__) \
   || defined(__i960__) \
   || defined(__mc68000__) \
   || defined(__sh__) \
@@ -39,7 +41,7 @@ extern "C" {
   /* these cpus are ready to apply cpuopts.h */
 #include <rtems/score/cpuopts.h>
 #else
-  /* fallback to targopts.h for hppa1.1, mips, and powerpc */
+  /* fallback to targopts.h for mips and powerpc */
 #include <rtems/score/targopts.h>
 #endif