diff --git a/gstreamer-sharp/Gstreamer.metadata b/gstreamer-sharp/Gstreamer.metadata
index c80d68cea8..d298406f5e 100644
--- a/gstreamer-sharp/Gstreamer.metadata
+++ b/gstreamer-sharp/Gstreamer.metadata
@@ -700,6 +700,19 @@
 
   <attr path="/api/namespace/struct[@name='TypeFind']/method[@name='Register']" name="hidden">1</attr>
 
+  <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
+  <attr path="/api/namespace/object[@name='Task']/field" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@name='Task']/method[@cname='gst_task_cleanup_all']" name="hidden">1</attr>
+  <remove-node path="/api/namespace/object[@name='Task']/method[@cname='gst_task_create']" />>
+  <add-node path="/api/namespace/object[@name='Task']">
+      <constructor cname="gst_task_create">
+        <parameters>
+          <parameter type="GstTaskFunction" name="func" />
+          <parameter type="gpointer" name="data" />
+        </parameters>
+      </constructor>
+  </add-node>
+
   <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
   <attr path="/api/namespace/object[@name='TypeFindFactory']/field[@name='Caps']" name="hidden">1</attr>
   <!-- FIXME: Bug https://bugzilla.novell.com/show_bug.cgi?id=323372 -->
diff --git a/gstreamer-sharp/Makefile.am b/gstreamer-sharp/Makefile.am
index 299978328e..73b298c088 100644
--- a/gstreamer-sharp/Makefile.am
+++ b/gstreamer-sharp/Makefile.am
@@ -66,6 +66,7 @@ customs = 			\
 	Object.custom		\
 	PadTemplate.custom      \
 	Plugin.custom     	\
+	Task.custom     	\
 	MiniObject.custom       \
 	Registry.custom         \
 	Query.custom 	        \
diff --git a/gstreamer-sharp/Task.custom b/gstreamer-sharp/Task.custom
new file mode 100644
index 0000000000..fd842badf1
--- /dev/null
+++ b/gstreamer-sharp/Task.custom
@@ -0,0 +1,39 @@
+[DllImport ("gstreamersharpglue-0.10") ]
+extern static uint gstsharp_gst_task_get_cond_offset ();
+
+static uint cond_offset = gstsharp_gst_task_get_cond_offset ();
+private IntPtr CondPtr {
+  get {
+    unsafe {
+      IntPtr* raw_ptr = (IntPtr*) ( ( (byte*) Handle) + cond_offset);
+      return (*raw_ptr);
+    }
+  }
+}
+
+[DllImport ("libglib-2.0-0.dll") ]
+static extern void g_cond_wait (IntPtr cond, IntPtr mutex);
+[DllImport ("libglib-2.0-0.dll") ]
+static extern void g_cond_signal (IntPtr cond);
+
+public void Wait () {
+  g_cond_wait (CondPtr, LockPtr);
+}
+
+public void Signal () {
+  g_cond_signal (CondPtr);
+}
+
+[DllImport ("gstreamersharpglue-0.10") ]
+extern static uint gstsharp_gst_task_get_running_offset ();
+
+static uint running_offset = gstsharp_gst_task_get_running_offset ();
+public bool IsRunning {
+  get {
+    unsafe {
+      bool* raw_ptr = (bool*) ( ( (byte*) Handle) + running_offset);
+      return (*raw_ptr);
+    }
+  }
+}
+
diff --git a/gstreamer-sharp/glue/Makefile.am b/gstreamer-sharp/glue/Makefile.am
index 06676d1537..5fe9674dcc 100644
--- a/gstreamer-sharp/glue/Makefile.am
+++ b/gstreamer-sharp/glue/Makefile.am
@@ -10,6 +10,7 @@ libgstreamersharpglue_0_10_la_SOURCES =	\
 	bin.c \
 	structure.c \
 	taglist.c \
+	task.c \
 	object.c \
 	gobject.c
 
diff --git a/gstreamer-sharp/glue/task.c b/gstreamer-sharp/glue/task.c
new file mode 100644
index 0000000000..18b8ba5189
--- /dev/null
+++ b/gstreamer-sharp/glue/task.c
@@ -0,0 +1,13 @@
+#include <gst/gst.h>
+
+uint
+gstsharp_gst_task_get_cond_offset (void)
+{
+  return (uint) G_STRUCT_OFFSET (GstTask, cond);
+}
+
+uint
+gstsharp_gst_task_get_running_offset (void)
+{
+  return (uint) G_STRUCT_OFFSET (GstTask, running);
+}