diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c
index 7e1982bc9d71..ff34488a54d7 100644
--- a/sys/kern/kern_kse.c
+++ b/sys/kern/kern_kse.c
@@ -368,9 +368,8 @@ kse_release(struct thread * td, struct kse_release_args * uap)
 	mtx_lock_spin(&sched_lock);
 	/* Change OURSELF to become an upcall. */
 	td->td_flags = TDF_UPCALLING; /* BOUND */
-	if (!(td->td_kse->ke_flags & KEF_DOUPCALL) &&
+	if (!(td->td_kse->ke_flags & (KEF_DOUPCALL|KEF_ASTPENDING)) &&
 	    (kg->kg_completed == NULL)) {
-	/* XXXKSE also look for waiting signals etc. */
 		/*
 		 * The KSE will however be lendable.
 		 */
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 3329b870701e..77ee34b32f6f 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1528,8 +1528,6 @@ psignal(p, sig)
 				else if (TD_IS_IDLE(td)) {
  					thread_suspend_one(td);
 				}
-			
-				
 			}
 			if (p->p_suspcount == p->p_numthreads) {
 				mtx_unlock_spin(&sched_lock);
@@ -1642,6 +1640,8 @@ tdsignal(struct thread *td, int sig, sig_t action)
 			cv_abort(td);
 		else
 			abortsleep(td);
+	} else if (TD_IS_IDLE(td)) {
+		TD_CLR_IDLE(td);
 	}
 #ifdef SMP
 	  else {
diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c
index 7e1982bc9d71..ff34488a54d7 100644
--- a/sys/kern/kern_thread.c
+++ b/sys/kern/kern_thread.c
@@ -368,9 +368,8 @@ kse_release(struct thread * td, struct kse_release_args * uap)
 	mtx_lock_spin(&sched_lock);
 	/* Change OURSELF to become an upcall. */
 	td->td_flags = TDF_UPCALLING; /* BOUND */
-	if (!(td->td_kse->ke_flags & KEF_DOUPCALL) &&
+	if (!(td->td_kse->ke_flags & (KEF_DOUPCALL|KEF_ASTPENDING)) &&
 	    (kg->kg_completed == NULL)) {
-	/* XXXKSE also look for waiting signals etc. */
 		/*
 		 * The KSE will however be lendable.
 		 */