diff --git a/c/src/lib/libbsp/m68k/mcf5225x/ChangeLog b/c/src/lib/libbsp/m68k/mcf5225x/ChangeLog
index e9d811f237..e5c562e97a 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5225x/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-03	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	* include/bsp.h: Add BSP_SMALL_MEMORY.
+	* startup/linkcmds: Wildcard on .data so C++ links.
+
 2010-04-25	Joel Sherrill <joel.sherrilL@OARcorp.com>
 
 	* console/console.c: Fix prototypes.
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
index 50f38eb325..a1041c1f0b 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
@@ -21,6 +21,8 @@ extern "C" {
 #include <rtems/iosupp.h>
 #include <rtems/bspIo.h>
 
+#define BSP_SMALL_MEMORY 1
+
 /***************************************************************************/
 /**  Hardware data structure headers                                      **/
 #include <mcf5225x/mcf5225x.h>
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/startup/linkcmds b/c/src/lib/libbsp/m68k/mcf5225x/startup/linkcmds
index fd0c741679..9ff55e5055 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/mcf5225x/startup/linkcmds
@@ -127,7 +127,7 @@ SECTIONS
     {
         PROVIDE( _data_dest_start = . );
         PROVIDE( _copy_start = .);
-        *(.data)
+        *(.data*)
         *(.gnu.linkonce.d*)
         *(.gcc_except_table*)
         *(.jcr)