diff --git a/gdb-xml/power-core.xml b/gdb-xml/power-core.xml
index dae13a67ef..0c69e8c8a7 100644
--- a/gdb-xml/power-core.xml
+++ b/gdb-xml/power-core.xml
@@ -46,13 +46,4 @@
   <reg name="lr" bitsize="32" type="code_ptr"/>
   <reg name="ctr" bitsize="32" type="uint32"/>
   <reg name="xer" bitsize="32" type="uint32"/>
-  <!-- HACK: The way the QEMU GDB stub code is currently written requires
-       the "integer" registers from the XML file to span the entirety of
-       NUM_CORE_REGS that non-XML-aware GDB requires.  Otherwise, XML-aware
-       GDB thinks that "coprocessor" registers from XML, such as the
-       floating-point registers, have register numbers less than
-       NUM_CORE_REGS.  This can lead to problems.  Work around it by using
-       an unnamed register as padding; NUM_CORE_REGS on Power is 71 and
-       this register is 70.  It would be fpscr for non-XML-aware GDB.  -->
-  <reg name="" bitsize="32" type="uint32"/>
 </feature>
diff --git a/gdb-xml/power-fpu.xml b/gdb-xml/power-fpu.xml
index d1ca3a3d5c..38705515d4 100644
--- a/gdb-xml/power-fpu.xml
+++ b/gdb-xml/power-fpu.xml
@@ -7,7 +7,7 @@
 
 <!DOCTYPE feature SYSTEM "gdb-target.dtd">
 <feature name="org.gnu.gdb.power.fpu">
-  <reg name="f0" bitsize="64" type="ieee_double"/>
+  <reg name="f0" bitsize="64" type="ieee_double" regnum="71"/>
   <reg name="f1" bitsize="64" type="ieee_double"/>
   <reg name="f2" bitsize="64" type="ieee_double"/>
   <reg name="f3" bitsize="64" type="ieee_double"/>
diff --git a/gdb-xml/power-spe.xml b/gdb-xml/power-spe.xml
index 1ec15d66a1..57740cc5cb 100644
--- a/gdb-xml/power-spe.xml
+++ b/gdb-xml/power-spe.xml
@@ -7,7 +7,7 @@
 
 <!DOCTYPE feature SYSTEM "gdb-target.dtd">
 <feature name="org.gnu.gdb.power.spe">
-  <reg name="ev0h" bitsize="32"/>
+  <reg name="ev0h" bitsize="32" regnum="71"/>
   <reg name="ev1h" bitsize="32"/>
   <reg name="ev2h" bitsize="32"/>
   <reg name="ev3h" bitsize="32"/>
diff --git a/gdb-xml/power64-core.xml b/gdb-xml/power64-core.xml
index fef42e4166..6cc1531201 100644
--- a/gdb-xml/power64-core.xml
+++ b/gdb-xml/power64-core.xml
@@ -46,13 +46,4 @@
   <reg name="lr" bitsize="64" type="code_ptr"/>
   <reg name="ctr" bitsize="64" type="uint64"/>
   <reg name="xer" bitsize="32" type="uint32"/>
-  <!-- HACK: The way the QEMU GDB stub code is currently written requires
-       the "integer" registers from the XML file to span the entirety of
-       NUM_CORE_REGS that non-XML-aware GDB requires.  Otherwise, XML-aware
-       GDB thinks that "coprocessor" registers from XML, such as the
-       floating-point registers, have register numbers less than
-       NUM_CORE_REGS.  This can lead to problems.  Work around it by using
-       an unnamed register as padding; NUM_CORE_REGS on Power is 71 and
-       this register is 70.  It would be fpscr for non-XML-aware GDB.  -->
-  <reg name="" bitsize="32" type="uint32"/>
 </feature>