diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2247c790c7d..88ff989ba63 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-13  Pedro Alves  <palves@redhat.com>
+
+	* tracepoint.c (tfile_fetch_registers): Don't infer the PC from
+	the tracepoint if the PC is a pseudo-register.
+
 2014-01-13  Tom Tromey  <tromey@redhat.com>
 
 	* defs.h (XCALLOC): Remove.
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 582c284db26..4b472820e51 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -5060,7 +5060,17 @@ tfile_fetch_registers (struct target_ops *ops,
   /* We can often usefully guess that the PC is going to be the same
      as the address of the tracepoint.  */
   pc_regno = gdbarch_pc_regnum (gdbarch);
-  if (pc_regno >= 0 && (regno == -1 || regno == pc_regno))
+
+  /* XXX This guessing code below only works if the PC register isn't
+     a pseudo-register.  The value of a pseudo-register isn't stored
+     in the (non-readonly) regcache -- instead it's recomputed
+     (probably from some other cached raw register) whenever the
+     register is read.  This guesswork should probably move to some
+     higher layer.  */
+  if (pc_regno < 0 || pc_regno >= gdbarch_num_regs (gdbarch))
+    return;
+
+  if (regno == -1 || regno == pc_regno)
     {
       struct tracepoint *tp = get_tracepoint (tracepoint_number);