diff --git a/CHANGELOG b/CHANGELOG
index 1136f11f7..71eae5e7e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,9 @@ Changes for U-Boot 1.1.3:
 * Prepare for SoC rework of ARM code:
   - rename CONFIG_BOOTBINFUNC into  CONFIG_INIT_CRITICAL
   - rename memsetup into lowlevel_init (function name and source files)
+  Patch by Steven Scholz, 03 Apr 2005:
+  - create SoC specific directories include/asm-arm/arch-imx and
+    include/asm-arm/arch-s3c24x0
 
 * Fix problems with SNTP support;
   enable SNTP support in some boards.
diff --git a/board/mx1ads/mx1ads.c b/board/mx1ads/mx1ads.c
index 332f0a2be..5c33ba3c0 100644
--- a/board/mx1ads/mx1ads.c
+++ b/board/mx1ads/mx1ads.c
@@ -25,7 +25,7 @@
 
 #include <common.h>
 /*#include <mc9328.h>*/
-#include <asm/arch-arm920t/imx-regs.h>
+#include <asm/arch/imx-regs.h>
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/include/asm-arm/arch-arm920t/imx-regs.h b/include/asm-arm/arch-imx/imx-regs.h
similarity index 100%
rename from include/asm-arm/arch-arm920t/imx-regs.h
rename to include/asm-arm/arch-imx/imx-regs.h
diff --git a/include/asm-arm/arch-arm920t/memory.h b/include/asm-arm/arch-s3c24x0/memory.h
similarity index 100%
rename from include/asm-arm/arch-arm920t/memory.h
rename to include/asm-arm/arch-s3c24x0/memory.h
diff --git a/mkconfig b/mkconfig
index 266addd70..e36626718 100644
--- a/mkconfig
+++ b/mkconfig
@@ -31,7 +31,12 @@ cd ./include
 rm -f asm
 ln -s asm-$2 asm
 rm -f asm-$2/arch
-ln -s arch-$3 asm-$2/arch
+
+if [ -z "$6" -o "$6" == "NULL" ] ; then
+	ln -s arch-$3 asm-$2/arch
+else
+	ln -s arch-$6 asm-$2/arch
+fi
 
 if [ "$2" = "arm" ] ; then
 	rm -f asm-$2/proc