diff --git a/c/src/exec/score/ChangeLog b/c/src/exec/score/ChangeLog
index c00bec1627..bc1096298a 100644
--- a/c/src/exec/score/ChangeLog
+++ b/c/src/exec/score/ChangeLog
@@ -1,4 +1,8 @@
 
+2000-08-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* include/rtems/system.h: Include cpuopts.h for __i386__.
+
 2000-08-10	Joel Sherrill <joel@OARcorp.com>
 
 	* ChangeLog: New file.
diff --git a/c/src/exec/score/include/rtems/system.h b/c/src/exec/score/include/rtems/system.h
index 553c8b404a..b2f5690594 100644
--- a/c/src/exec/score/include/rtems/system.h
+++ b/c/src/exec/score/include/rtems/system.h
@@ -34,11 +34,12 @@ extern "C" {
   || defined(__i960__) \
   || defined(__mc68000__) \
   || defined(__sh__) \
-  || defined(__sparc__)
+  || defined(__sparc__) \
+  || defined(__i386__)
   /* these cpus are ready to apply cpuopts.h */
 #include <rtems/score/cpuopts.h>
 #else
-  /* fallback to targopts.h for hppa1.1, i386, mips, and powerpc */
+  /* fallback to targopts.h for hppa1.1, mips, and powerpc */
 #include <rtems/score/targopts.h>
 #endif
 
diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog
index c00bec1627..bc1096298a 100644
--- a/cpukit/score/ChangeLog
+++ b/cpukit/score/ChangeLog
@@ -1,4 +1,8 @@
 
+2000-08-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* include/rtems/system.h: Include cpuopts.h for __i386__.
+
 2000-08-10	Joel Sherrill <joel@OARcorp.com>
 
 	* ChangeLog: New file.
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
index 553c8b404a..b2f5690594 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/score/include/rtems/system.h
@@ -34,11 +34,12 @@ extern "C" {
   || defined(__i960__) \
   || defined(__mc68000__) \
   || defined(__sh__) \
-  || defined(__sparc__)
+  || defined(__sparc__) \
+  || defined(__i386__)
   /* these cpus are ready to apply cpuopts.h */
 #include <rtems/score/cpuopts.h>
 #else
-  /* fallback to targopts.h for hppa1.1, i386, mips, and powerpc */
+  /* fallback to targopts.h for hppa1.1, mips, and powerpc */
 #include <rtems/score/targopts.h>
 #endif