diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index a54bdd8a81..1323c3d211 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-29	Chris Johns <chrisj@rtems.org>
+
+	* tools/configure.ac: Add CFLAGS to workaround building errors on
+	a 64bit AMD host.
+
 2008-07-29	Chris Johns <chrisj@rtems.org>
 
 	* ide/ide.c: Updated to the rtems_* libblock changed.
diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure.ac b/c/src/lib/libbsp/i386/pc386/tools/configure.ac
index 7b372e1c49..61c25effcc 100644
--- a/c/src/lib/libbsp/i386/pc386/tools/configure.ac
+++ b/c/src/lib/libbsp/i386/pc386/tools/configure.ac
@@ -9,6 +9,8 @@ RTEMS_TOP(../../../../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
+CFLAGS="-g -O2 -Wall"
+
 AM_INIT_AUTOMAKE([no-define foreign 1.10])
 AM_MAINTAINER_MODE