diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 014a6327ce..3a3b812ea4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-26 Michael Eager <eager@eagercon.com>
+
+	* features/rs6000/powerpc-405.xml: New.
+	* rs6000-tdep.c: Add include & initialize for
+	powerpc-405.c, add 405 to variants.
+	* features/rs6000/powerpc-405.c: Generate.
+
 2009-07-21  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
 	* utils.c (internal_vproblem): Always print failure message.
diff --git a/gdb/features/rs6000/powerpc-405.c b/gdb/features/rs6000/powerpc-405.c
new file mode 100644
index 0000000000..7a6e476525
--- /dev/null
+++ b/gdb/features/rs6000/powerpc-405.c
@@ -0,0 +1,136 @@
+/* THIS FILE IS GENERATED.  Original: powerpc-405.xml */
+
+#include "defs.h"
+#include "gdbtypes.h"
+#include "target-descriptions.h"
+
+struct target_desc *tdesc_powerpc_405;
+static void
+initialize_tdesc_powerpc_405 (void)
+{
+  struct target_desc *result = allocate_target_description ();
+  struct tdesc_feature *feature;
+  struct type *field_type, *type;
+
+  feature = tdesc_create_feature (result, "org.gnu.gdb.power.core");
+  tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r2", 2, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r3", 3, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r4", 4, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r5", 5, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r6", 6, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r7", 7, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r8", 8, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r9", 9, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r10", 10, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r11", 11, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r12", 12, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r13", 13, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r14", 14, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r15", 15, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r16", 16, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r17", 17, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r18", 18, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r19", 19, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r20", 20, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r21", 21, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r22", 22, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r23", 23, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r24", 24, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r25", 25, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r26", 26, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r27", 27, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r28", 28, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r29", 29, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r30", 30, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "r31", 31, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "pc", 64, 1, NULL, 32, "code_ptr");
+  tdesc_create_reg (feature, "msr", 65, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "cr", 66, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "lr", 67, 1, NULL, 32, "code_ptr");
+  tdesc_create_reg (feature, "ctr", 68, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "xer", 69, 1, NULL, 32, "uint32");
+
+  feature = tdesc_create_feature (result, "org.gnu.gdb.power.fpu");
+  tdesc_create_reg (feature, "f0", 32, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f1", 33, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f2", 34, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f3", 35, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f4", 36, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f5", 37, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f6", 38, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f7", 39, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f8", 40, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f9", 41, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f10", 42, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f11", 43, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f12", 44, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f13", 45, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f14", 46, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f15", 47, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f16", 48, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f17", 49, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f18", 50, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f19", 51, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f20", 52, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f21", 53, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f22", 54, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f23", 55, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f24", 56, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f25", 57, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f26", 58, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f27", 59, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f28", 60, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f29", 61, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f30", 62, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "f31", 63, 1, NULL, 64, "ieee_double");
+  tdesc_create_reg (feature, "fpscr", 70, 1, "float", 32, "int");
+
+  feature = tdesc_create_feature (result, "405");
+  tdesc_create_reg (feature, "pvr", 87, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "sprg0", 108, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "sprg1", 109, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "sprg2", 110, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "sprg3", 111, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "srr0", 112, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "srr1", 113, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "tbl", 114, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "tbu", 115, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "icdbdr", 119, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "esr", 120, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "dear", 121, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "evpr", 122, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "tsr", 124, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "tcr", 125, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "pit", 126, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "srr2", 129, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "srr3", 130, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "dbsr", 131, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "dbcr", 132, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "iac1", 133, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "iac2", 134, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "dac1", 135, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "dac2", 136, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "dccr", 137, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "iccr", 138, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "zpr", 143, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "pid", 144, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "sgr", 145, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "dcwr", 146, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "ccr0", 149, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "dbcr1", 150, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "dvc1", 151, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "dvc2", 152, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "iac3", 153, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "iac4", 154, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "sler", 155, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "sprg4", 156, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "sprg5", 157, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "sprg6", 158, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "sprg7", 159, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "su0r", 160, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "usprg0", 161, 1, NULL, 32, "int");
+
+  tdesc_powerpc_405 = result;
+}
diff --git a/gdb/features/rs6000/powerpc-405.xml b/gdb/features/rs6000/powerpc-405.xml
new file mode 100644
index 0000000000..ee72c9cfa9
--- /dev/null
+++ b/gdb/features/rs6000/powerpc-405.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!-- Copyright (C) 2009 Free Software Foundation, Inc.
+
+     Copying and distribution of this file, with or without modification,
+     are permitted in any medium without royalty provided the copyright
+     notice and this notice are preserved.  -->
+
+<!DOCTYPE target SYSTEM "gdb-target.dtd">
+<target>
+  <xi:include href="power-core.xml"/>
+  <xi:include href="power-fpu.xml"/>
+
+  <feature name="405">
+    <reg name="pvr" bitsize="32" regnum="87"/>
+    <reg name="sprg0" bitsize="32" regnum="108"/>
+    <reg name="sprg1" bitsize="32"/>
+    <reg name="sprg2" bitsize="32"/>
+    <reg name="sprg3" bitsize="32"/>
+    <reg name="srr0" bitsize="32"/>
+    <reg name="srr1" bitsize="32"/>
+    <reg name="tbl" bitsize="32"/>
+    <reg name="tbu" bitsize="32"/>
+    <reg name="icdbdr" bitsize="32" regnum="119"/>
+    <reg name="esr" bitsize="32"/>
+    <reg name="dear" bitsize="32"/>
+    <reg name="evpr" bitsize="32"/>
+    <reg name="tsr" bitsize="32" regnum="124"/>
+    <reg name="tcr" bitsize="32"/>
+    <reg name="pit" bitsize="32"/>
+    <reg name="srr2" bitsize="32" regnum="129"/>
+    <reg name="srr3" bitsize="32"/>
+    <reg name="dbsr" bitsize="32"/>
+    <reg name="dbcr" bitsize="32"/>
+    <reg name="iac1" bitsize="32"/>
+    <reg name="iac2" bitsize="32"/>
+    <reg name="dac1" bitsize="32"/>
+    <reg name="dac2" bitsize="32"/>
+    <reg name="dccr" bitsize="32"/>
+    <reg name="iccr" bitsize="32"/>
+    <reg name="zpr" bitsize="32" regnum="143"/>
+    <reg name="pid" bitsize="32"/>
+    <reg name="sgr" bitsize="32"/>
+    <reg name="dcwr" bitsize="32"/>
+    <reg name="ccr0" bitsize="32" regnum="149"/>
+    <reg name="dbcr1" bitsize="32"/>
+    <reg name="dvc1" bitsize="32"/>
+    <reg name="dvc2" bitsize="32"/>
+    <reg name="iac3" bitsize="32"/>
+    <reg name="iac4" bitsize="32"/>
+    <reg name="sler" bitsize="32"/>
+    <reg name="sprg4" bitsize="32"/>
+    <reg name="sprg5" bitsize="32"/>
+    <reg name="sprg6" bitsize="32"/>
+    <reg name="sprg7" bitsize="32"/>
+    <reg name="su0r" bitsize="32"/>
+    <reg name="usprg0" bitsize="32"/>
+  </feature>
+</target>
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index d21e87bc96..295c6b2779 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -66,6 +66,7 @@
 #include "features/rs6000/powerpc-vsx32.c"
 #include "features/rs6000/powerpc-403.c"
 #include "features/rs6000/powerpc-403gc.c"
+#include "features/rs6000/powerpc-405.c"
 #include "features/rs6000/powerpc-505.c"
 #include "features/rs6000/powerpc-601.c"
 #include "features/rs6000/powerpc-602.c"
@@ -2948,6 +2949,8 @@ static struct variant variants[] =
    bfd_mach_rs6k, &tdesc_rs6000},
   {"403", "IBM PowerPC 403", bfd_arch_powerpc,
    bfd_mach_ppc_403, &tdesc_powerpc_403},
+  {"405", "IBM PowerPC 405", bfd_arch_powerpc,
+   bfd_mach_ppc_405, &tdesc_powerpc_405},
   {"601", "Motorola PowerPC 601", bfd_arch_powerpc,
    bfd_mach_ppc_601, &tdesc_powerpc_601},
   {"602", "Motorola PowerPC 602", bfd_arch_powerpc,
@@ -4038,6 +4041,7 @@ _initialize_rs6000_tdep (void)
   initialize_tdesc_powerpc_vsx32 ();
   initialize_tdesc_powerpc_403 ();
   initialize_tdesc_powerpc_403gc ();
+  initialize_tdesc_powerpc_405 ();
   initialize_tdesc_powerpc_505 ();
   initialize_tdesc_powerpc_601 ();
   initialize_tdesc_powerpc_602 ();