diff --git a/c/src/lib/libbsp/arm/gumstix/ChangeLog b/c/src/lib/libbsp/arm/gumstix/ChangeLog
index 58eef9c1dc..e30fdce8cb 100644
--- a/c/src/lib/libbsp/arm/gumstix/ChangeLog
+++ b/c/src/lib/libbsp/arm/gumstix/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-05	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* configure.ac, include/bspopts.h.in: Add ON_SKYEYE option to at least
+	enable fast idle mode. Also added some standard BSP options.
+
 2009-06-04	Xi Yang <hiyangxi@gmail.com>
 
 	* .cvsignore, ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
diff --git a/c/src/lib/libbsp/arm/gumstix/configure.ac b/c/src/lib/libbsp/arm/gumstix/configure.ac
index 8bdd9fe3cd..4dbce16eaf 100755
--- a/c/src/lib/libbsp/arm/gumstix/configure.ac
+++ b/c/src/lib/libbsp/arm/gumstix/configure.ac
@@ -15,6 +15,24 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
 RTEMS_CANONICALIZE_TOOLS
 RTEMS_PROG_CCAS
 
+RTEMS_BSPOPTS_SET([ON_SKYEYE],[*],[])
+RTEMS_BSPOPTS_HELP([ON_SKYEYE],
+[If defined, enable options which optimize executingon the Skyeye 
+ simulator.  Speed up the clock ticks while the idle task is running so
+ time spent in the idle task is minimized.  This significantly reduces
+ the wall time required to execute the RTEMS test suites.])
+
+RTEMS_BSPOPTS_SET([BSP_PRESS_KEY_FOR_RESET],[*],[0])
+RTEMS_BSPOPTS_HELP([BSP_PRESS_KEY_FOR_RESET],
+[If defined, print a message and wait until pressed before resetting
+ board when application exits.])
+
+RTEMS_BSPOPTS_SET([BSP_RESET_BOARD_AT_EXIT],[*],[1])
+RTEMS_BSPOPTS_HELP([BSP_RESET_BOARD_AT_EXIT],
+[If defined, reset the board when the application exits.])
+
+BSP_BOOTCARD_OPTIONS
+
 RTEMS_CHECK_NETWORKING 
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
diff --git a/c/src/lib/libbsp/arm/gumstix/include/bspopts.h.in b/c/src/lib/libbsp/arm/gumstix/include/bspopts.h.in
index f11cf7efbb..7c08e706cf 100644
--- a/c/src/lib/libbsp/arm/gumstix/include/bspopts.h.in
+++ b/c/src/lib/libbsp/arm/gumstix/include/bspopts.h.in
@@ -1,5 +1,23 @@
 /* include/bspopts.h.in.  Generated from configure.ac by autoheader.  */
 
+/* If defined, then the BSP Framework will put a non-zero pattern into the
+   RTEMS Workspace and C program heap. This should assist in finding code that
+   assumes memory starts set to zero. */
+#undef BSP_DIRTY_MEMORY
+
+/* If defined, print a message and wait until pressed before resetting board
+   when application exits. */
+#undef BSP_PRESS_KEY_FOR_RESET
+
+/* If defined, reset the board when the application exits. */
+#undef BSP_RESET_BOARD_AT_EXIT
+
+/* If defined, enable options which optimize executingon the Skyeye simulator.
+   Speed up the clock ticks while the idle task is running so time spent in
+   the idle task is minimized. This significantly reduces the wall time
+   required to execute the RTEMS test suites. */
+#undef ON_SKYEYE
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT