diff --git a/ChangeLog b/ChangeLog
index d26df8b..73ae60b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni
 # Distributed under the GPL v2
 
+  29 Jul 2008; Andrew Gaffney <agaffney@gentoo.org> +arch/um/busy-config,
+  +arch/um/config.sh, +arch/um/kernel-config, +arch/um/modules_load,
+  -um/busy-config, -um/config.sh, -um/kernel-config, -um/modules_load:
+  Move um/ underneath arch/ where it belongs
+
   28 Jul 2008; Chris Gianelloni <wolf31o2@wolf31o2.org> gen_compile.sh:
   Removed some unused dietlibc code.
 
diff --git a/um/busy-config b/arch/um/busy-config
similarity index 100%
rename from um/busy-config
rename to arch/um/busy-config
diff --git a/um/config.sh b/arch/um/config.sh
similarity index 100%
rename from um/config.sh
rename to arch/um/config.sh
diff --git a/um/kernel-config b/arch/um/kernel-config
similarity index 100%
rename from um/kernel-config
rename to arch/um/kernel-config
diff --git a/um/modules_load b/arch/um/modules_load
similarity index 100%
rename from um/modules_load
rename to arch/um/modules_load