diff --git a/make/ChangeLog b/make/ChangeLog
index 7d0550861c..b4e43e036e 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-04	Xi Yang <hiyangxi@gmail.com>
+
+	* Makefile.am: New Gumstix BSP.
+	* custom/gumstix.cfg: New file.
+
 2009-05-28	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* custom/csb637.cfg: New file.
diff --git a/make/Makefile.am b/make/Makefile.am
index da1fd18d27..3af7bb6ea5 100644
--- a/make/Makefile.am
+++ b/make/Makefile.am
@@ -50,6 +50,7 @@ EXTRA_DIST += custom/gensh1.cfg
 EXTRA_DIST += custom/gensh2.cfg
 EXTRA_DIST += custom/gensh4.cfg
 EXTRA_DIST += custom/gp32.cfg
+EXTRA_DIST += custom/gumstix.cfg
 EXTRA_DIST += custom/h8sim.cfg
 EXTRA_DIST += custom/h8sxsim.cfg
 EXTRA_DIST += custom/haleakala.cfg
diff --git a/make/custom/gumstix.cfg b/make/custom/gumstix.cfg
new file mode 100644
index 0000000000..b13dfa5e50
--- /dev/null
+++ b/make/custom/gumstix.cfg
@@ -0,0 +1,20 @@
+#
+#  Config file for Gumstix (http://www.gumstix.com)
+#
+#  $Id$
+#
+
+include $(RTEMS_ROOT)/make/custom/default.cfg
+
+RTEMS_CPU=arm
+RTEMS_CPU_MODEL=pxa255
+
+# This is the actual bsp directory used during the build process.
+RTEMS_BSP_FAMILY=gumstix
+
+#  This contains the compiler options necessary to select the CPU model
+#  and (hopefully) optimize for it. 
+CPU_CFLAGS = -mcpu=xscale -mstructure-size-boundary=8 
+
+# optimize flag: typically -O2
+CFLAGS_OPTIMIZE_V = -O2 -g