diff --git a/frysk-core/frysk/proc/TestTaskObserverInstruction.java b/frysk-core/frysk/proc/TestTaskObserverInstruction.java
index d5e3d2a..546a763 100644
--- a/frysk-core/frysk/proc/TestTaskObserverInstruction.java
+++ b/frysk-core/frysk/proc/TestTaskObserverInstruction.java
@@ -43,6 +43,9 @@ import frysk.testbed.TestLib;
 import frysk.testbed.Offspring;
 import frysk.testbed.SlaveOffspring;
 
+import frysk.testbed.DaemonBlockedAtEntry;
+import frysk.config.Config;
+
 public class TestTaskObserverInstruction extends TestLib
 {
   public void testInstruction()
@@ -136,6 +139,30 @@ public class TestTaskObserverInstruction extends TestLib
     assertTrue("InstructionObserver hit", instr.hit == 2);
   }
 
+  /**
+   * Tests stepping the very first instruction (actualy the start of the
+   * dynamic loader which is going to load the actual program). This is
+   * a nasty corner case since this isn't a "real step" but actually the
+   * kernel adjusting the task so that it will start running.
+   */
+  public void testFirstInstructionAtEntry()
+  {
+    DaemonBlockedAtEntry daemon;
+    daemon = new DaemonBlockedAtEntry(Config.getPkgLibFile("funit-child"));
+    Task task = daemon.getMainTask();
+
+    InstructionObserver instr = new InstructionObserver();
+    task.requestAddInstructionObserver(instr);
+    assertRunUntilStop("add InstructionObserver");
+    assertTrue("InstructionObserver added", instr.added);
+    assertTrue("InstructionObserver hit", instr.hit == 1);
+
+    daemon.requestUnblock();
+    task.requestUnblock(instr);
+    assertRunUntilStop("step first instruction");
+    assertTrue("InstructionObserver hit again", instr.hit == 2);
+  }
+
   private class StepAttachedObserver implements TaskAttachedObserverXXX
   {
     private final InstructionObserver instr;
diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
index 3e590c4..9a71530 100644
--- a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
+++ b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java
@@ -891,6 +891,10 @@ abstract class LinuxPtraceTaskState extends State {
 		((TaskObservation) i.next()).delete();
 	    }
 
+	    // Mark this LinuxPtraceTask as just started.  See
+	    // Running.handleTrapped for more explanation.
+	    task.justStartedXXX = true;
+
 	    if (task.notifyExeced() > 0) {
 		return (task.syscallObservers.numberOfObservers() > 0
 			? syscallBlockedInSyscallContinue