diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 73af48274eee..14952c710d87 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_main.c,v 1.233 2004/03/09 02:35:45 junyoung Exp $	*/
+/*	$NetBSD: init_main.c,v 1.234 2004/03/27 00:42:38 jonathan Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1992, 1993
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.233 2004/03/09 02:35:45 junyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.234 2004/03/27 00:42:38 jonathan Exp $");
 
 #include "fs_nfs.h"
 #include "opt_nfsserver.h"
@@ -94,6 +94,7 @@ __KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.233 2004/03/09 02:35:45 junyoung Exp
 #include <sys/errno.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
+#include <sys/kcont.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
@@ -267,6 +268,9 @@ main(void)
 	/* Initialize sockets. */
 	soinit();
 
+	/* Initialize kcont. */
+        kcont_init();
+
 	/*
 	 * The following things must be done before autoconfiguration.
 	 */
diff --git a/sys/kern/kern_kcont.c b/sys/kern/kern_kcont.c
index 17d2abe90659..062c4024d412 100644
--- a/sys/kern/kern_kcont.c
+++ b/sys/kern/kern_kcont.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_kcont.c,v 1.8 2004/03/25 23:02:58 enami Exp $ */
+/* $NetBSD: kern_kcont.c,v 1.9 2004/03/27 00:42:38 jonathan Exp $ */
 
 /*
  * Copyright 2003 Jonathan Stone.
@@ -37,16 +37,18 @@
 /*
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_kcont.c,v 1.8 2004/03/25 23:02:58 enami Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: kern_kcont.c,v 1.9 2004/03/27 00:42:38 jonathan Exp $ ");
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
+#include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/kthread.h>
 #include <sys/proc.h>
+#include <sys/systm.h>
 #include <lib/libkern/libkern.h>
 
 #include <machine/intr.h>	/* IPL_*, and schedsoftnet() */
@@ -65,6 +67,7 @@ static __inline struct kc *kcont_dequeue_atomic(kcq_t *kcq);
 
 
 static void	kcont_worker(void * /*arg*/);
+static void	kcont_create_worker(void *);
 
 
 #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
@@ -340,6 +343,14 @@ kcont_run_softserial(void *arg)
 }
 #endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */
 
+
+static void
+kcont_create_worker(void *arg)
+{
+	if (kthread_create1(kcont_worker, NULL, NULL, "kcont"))
+		panic("fork kcont");
+}
+
 /*
  * Main entrypoint for kcont worker kthreads to execute
  * a continuation which requested deferral to process context.
@@ -352,8 +363,8 @@ kcont_worker(void *arg)
 	(void)arg;	/* kill GCC warning */
 
 	while (1) {
-		status = ltsleep(&kcq_process_ctxt, PCATCH, "kcont", 0, NULL);
-		if (status != 0)
+		status = ltsleep(&kcq_process_ctxt, PCATCH, "kcont", hz, NULL);
+		if (status != 0 && status != EWOULDBLOCK)
 			break;
 		kcont_run(&kcq_process_ctxt, NULL, 0, KC_IPL_DEFER_PROCESS);
 	}
@@ -395,5 +406,5 @@ kcont_init(void)
 	 * locking should have at least one worker kthread per CPU).
 	 */
 	SIMPLEQ_INIT(&kcq_process_ctxt);
-	kthread_create(kcont_worker, NULL);
+	kthread_create(kcont_create_worker, NULL);
 }