diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 711b8d2fd7f..0964c5fcdc8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-08  Tristan Gingold  <gingold@adacore.com>
+
+	* sparc-stub.c: Move to stubs/
+	* sh-stub.c: Likewise.
+	* m68k-stub.c: Likewise.
+	* m32r-stub.c: Likewise.
+	* i386-stub.c: Likewise.
+
 2012-03-08  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* m68klinux-tdep.c (m68k_linux_init_abi): Register
diff --git a/gdb/stubs/ChangeLog b/gdb/stubs/ChangeLog
index 1a8b2b702b3..a0f175e30df 100644
--- a/gdb/stubs/ChangeLog
+++ b/gdb/stubs/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-08  Tristan Gingold  <gingold@adacore.com>
+
+	* sparc-stub.c: Move from ..
+	* sh-stub.c: Likewise.
+	* m68k-stub.c: Likewise.
+	* m32r-stub.c: Likewise.
+	* i386-stub.c: Likewise.
+
 2012-03-05  Tristan Gingold  <gingold@adacore.com>
 
 	* buildvms.com: New file.
diff --git a/gdb/i386-stub.c b/gdb/stubs/i386-stub.c
similarity index 100%
rename from gdb/i386-stub.c
rename to gdb/stubs/i386-stub.c
diff --git a/gdb/m32r-stub.c b/gdb/stubs/m32r-stub.c
similarity index 100%
rename from gdb/m32r-stub.c
rename to gdb/stubs/m32r-stub.c
diff --git a/gdb/m68k-stub.c b/gdb/stubs/m68k-stub.c
similarity index 100%
rename from gdb/m68k-stub.c
rename to gdb/stubs/m68k-stub.c
diff --git a/gdb/sh-stub.c b/gdb/stubs/sh-stub.c
similarity index 100%
rename from gdb/sh-stub.c
rename to gdb/stubs/sh-stub.c
diff --git a/gdb/sparc-stub.c b/gdb/stubs/sparc-stub.c
similarity index 100%
rename from gdb/sparc-stub.c
rename to gdb/stubs/sparc-stub.c