diff --git a/src/core/job.c b/src/core/job.c
index 8d768586..00c0e6c4 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -34,6 +34,14 @@ void job_done ( struct job_interface *job, int rc ) {
 	job_put ( dest );
 }
 
+void job_kill ( struct job_interface *job ) {
+	struct job_interface *dest = job_get_dest ( job );
+
+	dest->op->kill ( dest );
+	job_unplug ( job );
+	job_put ( dest );
+}
+
 /****************************************************************************
  *
  * Helper methods
diff --git a/src/core/monojob.c b/src/core/monojob.c
new file mode 100644
index 00000000..b4042a3d
--- /dev/null
+++ b/src/core/monojob.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2007 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <errno.h>
+#include <gpxe/process.h>
+#include <console.h>
+#include <gpxe/keys.h>
+#include <gpxe/job.h>
+#include <gpxe/monojob.h>
+
+/** @file
+ *
+ * Single foreground job
+ *
+ */
+
+static int monojob_rc;
+
+static void monojob_done ( struct job_interface *job __unused, int rc ) {
+	monojob_rc = rc;
+}
+
+/** Single foreground job operations */
+static struct job_interface_operations monojob_operations = {
+	.done		= monojob_done,
+	.kill		= ignore_job_kill,
+	.progress	= ignore_job_progress,
+};
+
+/** Single foreground job */
+struct job_interface monojob = {
+	.intf = {
+		.dest = &null_job.intf,
+		.refcnt = NULL,
+	},
+	.op = &monojob_operations,
+};
+
+/**
+ * Wait for single foreground job to complete
+ *
+ * @ret rc		Job final status code
+ */
+int monojob_wait ( void ) {
+	int key;
+
+	monojob_rc = -EINPROGRESS;
+	while ( monojob_rc == -EINPROGRESS ) {
+		step();
+		if ( iskey() ) {
+			key = getchar();
+			switch ( key ) {
+			case CTRL_C:
+				job_kill ( &monojob );
+				return -ECANCELED;
+				break;
+			default:
+				break;
+			}
+		}
+	}
+	return monojob_rc;
+}
diff --git a/src/include/gpxe/job.h b/src/include/gpxe/job.h
index 3190fa21..8e11aa33 100644
--- a/src/include/gpxe/job.h
+++ b/src/include/gpxe/job.h
@@ -65,6 +65,7 @@ extern struct job_interface null_job;
 extern struct job_interface_operations null_job_ops;
 
 extern void job_done ( struct job_interface *job, int rc );
+extern void job_kill ( struct job_interface *job );
 
 extern void ignore_job_done ( struct job_interface *job, int rc );
 extern void ignore_job_kill ( struct job_interface *job );
diff --git a/src/include/gpxe/monojob.h b/src/include/gpxe/monojob.h
new file mode 100644
index 00000000..f6cebb6b
--- /dev/null
+++ b/src/include/gpxe/monojob.h
@@ -0,0 +1,15 @@
+#ifndef _GPXE_MONOJOB_H
+#define _GPXE_MONOJOB_H
+
+/** @file
+ *
+ * Single foreground job
+ *
+ */
+
+struct job_interface;
+
+extern struct job_interface monojob;
+extern int monojob_wait ( void );
+
+#endif /* _GPXE_MONOJOB_H */