diff --git a/Source/charon/scheduler.c b/Source/charon/scheduler.c
new file mode 100644
index 000000000..b028a97a7
--- /dev/null
+++ b/Source/charon/scheduler.c
@@ -0,0 +1,99 @@
+/**
+ * @file scheduler.c
+ * 
+ * @brief implements the scheduler, looks for jobs in event-queue
+ * 
+ */
+
+/*
+ * Copyright (C) 2005 Jan Hutter, Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * 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 (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * 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.
+ */
+ 
+#include <stdlib.h>
+#include <pthread.h>
+#include <freeswan.h>
+#include <pluto/constants.h>
+#include <pluto/defs.h>
+ 
+#include "scheduler.h"
+#include "job_queue.h"
+#include "globals.h"
+ 
+/**
+ * Private data of a scheduler object
+ */
+typedef struct private_scheduler_s private_scheduler_t;
+ 
+struct private_scheduler_s { 	
+	/**
+	 * Public part of a scheduler object
+	 */
+	 scheduler_t public;
+	 
+	 /**
+	  * Assigned thread to the scheduler_t-object
+	  */
+	 pthread_t assigned_thread;
+
+};
+
+/**
+ * Thread function started at creation of the scheduler object
+ * 
+ * @param this assigned scheduler object
+ * @return SUCCESS if thread_function ended successfully, FAILED otherwise
+ */
+static void scheduler_thread_function(private_scheduler_t * this)
+{
+	/* cancellation disabled by default */
+	pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
+	job_t *current_job;
+	
+	for (;;)
+	{
+		/* get a job, this block until one is available */
+		global_event_queue->get(global_event_queue, &current_job);
+		/* queue the job in the job queue, workers will eat them */
+		global_job_queue->add(global_job_queue, current_job);
+	}
+}
+
+/**
+ * Implementation of scheduler_t's destroy function
+ */
+static status_t destroy(private_scheduler_t *this)
+{
+	pthread_cancel(this->assigned_thread);
+	
+	pthread_join(this->assigned_thread, NULL);
+
+	pfree(this);
+	return SUCCESS;
+}
+
+
+scheduler_t * scheduler_create()
+{
+	private_scheduler_t *this = alloc_thing(private_scheduler_t,"private_scheduler_t");
+	
+	this->public.destroy = (status_t(*)(scheduler_t*)) destroy;
+	if (pthread_create(&(this->assigned_thread), NULL, (void*(*)(void*))scheduler_thread_function, this) != 0)
+	{
+		/* thread could not be created  */
+		pfree(this);
+		return NULL;
+	}
+	
+	return &(this->public);
+}
diff --git a/Source/charon/scheduler.h b/Source/charon/scheduler.h
new file mode 100644
index 000000000..36ba1dbd4
--- /dev/null
+++ b/Source/charon/scheduler.h
@@ -0,0 +1,50 @@
+/**
+ * @file scheduler.h
+ * 
+ * @brief implements the scheduler, looks for jobs in event-queue
+ * 
+ */
+
+/*
+ * Copyright (C) 2005 Jan Hutter, Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * 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 (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * 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.
+ */
+
+#ifndef SCHEDULER_H_
+#define SCHEDULER_H_
+
+#include "types.h"
+
+/**
+ * @brief The scheduler, looks for timed events in event-queue and adds them
+ * to the job-queue.
+ * 
+ * Starts a thread which does the work, since event-queue is blocking
+ */
+typedef struct scheduler_s scheduler_t;
+
+struct scheduler_s { 	
+
+	/**
+	 * @brief Destroys a scheduler object
+	 * 
+	 * @param scheduler scheduler object
+	 * @return SUCCESSFUL if succeeded, FAILED otherwise
+	 */
+	status_t (*destroy) (scheduler_t *scheduler);
+};
+
+
+scheduler_t * scheduler_create();
+
+#endif /*SCHEDULER_H_*/