diff --git a/src/libfibre/libfibre.so-gdb.py b/src/libfibre/libfibre.so-gdb.py
index 85b6b6f1015fc99b6c142081fdf1032d77f8ac7f..91500c72b21a6c0522c9ae994d7ce1002762d062 100644
--- a/src/libfibre/libfibre.so-gdb.py
+++ b/src/libfibre/libfibre.so-gdb.py
@@ -146,12 +146,17 @@ class InfoFibres(gdb.Command):
 
     def invoke(self, arg, from_tty):
         curr = gdb.parse_and_eval("Context::currStack")
+        print(" Idx \t Target Ptr \t Frame")
         for i in range(len(FibreSupport.list)):
-            print(str(i), "\tFibre", str(FibreSupport.list[i]), end='')
             if (FibreSupport.list[i] == curr):
-                print(" (*)", end='')
+                print("* ", end='')
+            else:
+                print("  ", end='')
+            print(str(i), "\tFibre", str(FibreSupport.list[i]), end='')
             with FibreSupport.get_frame(FibreSupport.list[i]) as frame:
                 if frame is not None:
+                    # Print instruction pointer
+                    print("\t", str(gdb.parse_and_eval("$rip")).split(None, 1)[0], end='')
                     print(" in ", frame.name(), sep='', end='')
                     sal = frame.find_sal()
                     if sal is not None and sal.symtab is not None: