diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index 4e38b5e7d9bc..62644622d796 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -803,7 +803,7 @@ trap(int vector, struct trapframe *tf)
 		 * out of the gateway page we'll get back into the kernel
 		 * and then we enable single stepping.
 		 * Since this a rather round-about way of enabling single
-		 * stepping, don't make things complicated even more by
+		 * stepping, don't make things even more complicated by
 		 * calling userret() and do_ast(). We do that later...
 		 */
 		tf->tf_special.psr &= ~IA64_PSR_LP;
@@ -814,13 +814,14 @@ trap(int vector, struct trapframe *tf)
 		/*
 		 * Don't assume there aren't any branches other than the
 		 * branch that takes us out of the gateway page. Check the
-		 * iip and raise SIGTRAP only when it's an user address.
+		 * iip and enable single stepping only when it's an user
+		 * address.
 		 */
 		if (tf->tf_special.iip >= VM_MAX_ADDRESS)
 			return;
 		tf->tf_special.psr &= ~IA64_PSR_TB;
-		sig = SIGTRAP;
-		break;
+		tf->tf_special.psr |= IA64_PSR_SS;
+		return;
 
 	case IA64_VEC_IA32_EXCEPTION:
 	case IA64_VEC_IA32_INTERCEPT: