--- kern_sig.c.orig	2013-05-07 11:11:44.000000000 +0200
+++ kern_sig.c	2013-05-07 11:33:52.000000000 +0200
@@ -2869,12 +2869,21 @@
 		if (coredump(td) == 0)
 			sig |= WCOREFLAG;
 		if (kern_logsigexit)
-			log(LOG_INFO,
-			    "pid %d (%s), uid %d: exited on signal %d%s\n",
-			    p->p_pid, p->p_comm,
-			    td->td_ucred ? td->td_ucred->cr_uid : -1,
-			    sig &~ WCOREFLAG,
-			    sig & WCOREFLAG ? " (core dumped)" : "");
+		  	if (p->p_flag & P_JAILED)
+				log(LOG_INFO,
+				    "pid %d (%s), uid %d, jid %d: exited on signal %d%s\n",
+				    p->p_pid, p->p_comm,
+				    td->td_ucred ? td->td_ucred->cr_uid : -1,
+				    p->p_ucred ? p->p_ucred->cr_prison->pr_id : -1,
+				    sig &~ WCOREFLAG,
+				    sig & WCOREFLAG ? " (core dumped)" : "");
+			else
+				log(LOG_INFO,
+				    "pid %d (%s), uid %d: exited on signal %d%s\n",
+				    p->p_pid, p->p_comm,
+				    td->td_ucred ? td->td_ucred->cr_uid : -1,
+				    sig &~ WCOREFLAG,
+				    sig & WCOREFLAG ? " (core dumped)" : "");
 	} else
 		PROC_UNLOCK(p);
 	exit1(td, W_EXITCODE(0, sig));