diff --git a/CHANGELOG b/CHANGELOG
index 85ae3efbd5..4cc66295d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Add lowboot target to mcc200 board
+  Patch by Stefan Roese, 4 Mar 2006
+
 * Fix problem with flash_get_size() from CFI driver update
   Patch by Stefan Roese, 1 Mar 2006
 
diff --git a/Makefile b/Makefile
index eafbfb604b..30a1d1f334 100644
--- a/Makefile
+++ b/Makefile
@@ -294,7 +294,13 @@ icecube_5100_config:			unconfig
 inka4x0_config:	unconfig
 	@./mkconfig inka4x0 ppc mpc5xxx inka4x0
 
-mcc200_config:	unconfig
+mcc200_config	\
+mcc200_lowboot_config:	unconfig
+	@ >include/config.h
+	@[ -z "$(findstring lowboot_,$@)" ] || \
+		{ echo "TEXT_BASE = 0xFE000000" >board/mcc200/config.tmp ; \
+		  echo "... with lowboot configuration" ; \
+		}
 	@./mkconfig mcc200 ppc mpc5xxx mcc200
 
 o2dnt_config:
diff --git a/board/mcc200/config.mk b/board/mcc200/config.mk
index 0a278b16bf..fa55673adf 100644
--- a/board/mcc200/config.mk
+++ b/board/mcc200/config.mk
@@ -22,10 +22,22 @@
 #
 
 #
-# MCC200 board
+# MCC200 board:
+#
+#	Valid values for TEXT_BASE are:
+#
+#	0xFFF00000   boot high (standard configuration)
+#	0xFE000000   boot low
+#	0x00100000   boot from RAM (for testing only)
 #
 
-TEXT_BASE = 0xfff00000
+sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp
+
+ifndef TEXT_BASE
+## Standard: boot high
+TEXT_BASE = 0xFFF00000
+## For testing: boot from RAM
 # TEXT_BASE = 0x00100000
+endif
 
 PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -I$(TOPDIR)/board