diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e175900d43..57154ed160 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-13  Kevin Buettner  <kevinb@redhat.com>
+
+	* ia64-linux-nat.c (fill_gregset, fill_fpregset): Replace
+	references to deprecated_registers[] with equivalent code.
+
 2004-10-13  Kevin Buettner  <kevinb@redhat.com>
 
 	* rs6000-tdep.c (rs6000_push_dummy_call): Replace references to
diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
index 3a6173094e..285567c9bb 100644
--- a/gdb/ia64-linux-nat.c
+++ b/gdb/ia64-linux-nat.c
@@ -418,8 +418,7 @@ fill_gregset (gregset_t *gregsetp, int regno)
 
 #define COPY_REG(_idx_,_regi_) \
   if ((regno == -1) || regno == _regi_) \
-    memcpy (regp + _idx_, &deprecated_registers[DEPRECATED_REGISTER_BYTE (_regi_)], \
-	    register_size (current_gdbarch, _regi_))
+    regcache_raw_collect (current_regcache, _regi_, regp + _idx_)
 
   for (regi = IA64_GR0_REGNUM; regi <= IA64_GR31_REGNUM; regi++)
     {
@@ -476,17 +475,12 @@ void
 fill_fpregset (fpregset_t *fpregsetp, int regno)
 {
   int regi;
-  char *to;
-  char *from;
 
   for (regi = IA64_FR0_REGNUM; regi <= IA64_FR127_REGNUM; regi++)
     {
       if ((regno == -1) || (regno == regi))
-	{
-	  from = (char *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (regi)];
-	  to = (char *) &((*fpregsetp)[regi - IA64_FR0_REGNUM]);
-	  memcpy (to, from, register_size (current_gdbarch, regi));
-	}
+	regcache_raw_collect (current_regcache, regi,
+			      &((*fpregsetp)[regi - IA64_FR0_REGNUM]));
     }
 }