diff --git a/CHANGELOG b/CHANGELOG
index 31233b789206fe30057a0dd234cc58b6820eaeae..e12d767276e96c5e6bfe0afba1caa53b236fda2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Add support for EP82xxM boards
+  Patch by Aaron Sells, 20 Jun 2006
+
 * Fix comments in include/ppc440.h
   Patch by Martin Hicks, 16 Jun 2006
 
diff --git a/CREDITS b/CREDITS
index 32d3060c3fecdb23edc09794ef21f20aee066289..3f7b5105561adedb53bb067910d36ad6cdc60c5f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -386,6 +386,10 @@ N: Robert Schwebel
 E: r.schwebel@pengutronix.de
 D: Support for csb226, logodl and innokom boards (PXA2xx)
 
+N: Aaron Sells
+E: sellsa@embeddedplanet.com
+D: Support for EP82xxM
+
 N: Art Shipkowski
 E: art@videon-central.com
 D: Support for NetSilicon NS7520
diff --git a/MAKEALL b/MAKEALL
index 2a334ffbf93134a9ad53dbd27f49fc8344643002..e9c04a674655e0fce588e15db6df3dda0a55699b 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -117,12 +117,12 @@ LIST_824x="	\
 
 LIST_8260="	\
 	atc		cogent_mpc8260	CPU86		CPU87		\
-	ep8248		ep8260		gw8260		hymod		\
-	IPHASE4539	ISPAN		MPC8260ADS	MPC8266ADS	\
-	MPC8272ADS	PM826		PM828		ppmc8260	\
-	Rattler8248	RPXsuper	rsdproto	sacsng		\
-	sbc8260		SCM		TQM8260_AC	TQM8260_AD	\
-	TQM8260_AE	ZPC1900						\
+	ep8248		ep8260		ep82xxm		gw8260		\
+	hymod		IPHASE4539	ISPAN		MPC8260ADS	\
+	MPC8266ADS	MPC8272ADS	PM826		PM828		\
+	ppmc8260	Rattler8248	RPXsuper	rsdproto	\
+	sacsng		sbc8260		SCM		TQM8260_AC	\
+	TQM8260_AD	TQM8260_AE	ZPC1900				\
 "
 
 #########################################################################
diff --git a/Makefile b/Makefile
index f48ca6cebb5881dba42f9c5d8f98e3f73ffb3c1d..8ef0097a4d2f205d4548cefac110e216cbf13039 100644
--- a/Makefile
+++ b/Makefile
@@ -1332,6 +1332,9 @@ ep8248E_config	:	unconfig
 ep8260_config:	unconfig
 	@$(MKCONFIG) $(@:_config=) ppc mpc8260 ep8260
 
+ep82xxm_config:	unconfig
+	@./mkconfig $(@:_config=) ppc mpc8260 ep82xxm
+
 gw8260_config:	unconfig
 	@$(MKCONFIG) $(@:_config=) ppc mpc8260 gw8260