diff --git a/organize/work/browser.py b/organize/work/browser.py
index c2ca89e..9678a83 100644
--- a/organize/work/browser.py
+++ b/organize/work/browser.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2014 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2015 Helmut Merz helmutm@cy55.de
 #
 #  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
@@ -85,6 +85,14 @@ class WorkItemDetails(TrackDetails):
     def deadline(self):
         return self.formatTimeStamp(self.track.deadline, 'date')
 
+    @Lazy
+    def deadlineTime(self):
+        return self.formatTimeStamp(self.track.deadline, 'time')
+
+    @Lazy
+    def deadlineWithTime(self):
+        return self.globalOptions('organize.work.deadline_with_time')
+
     @Lazy
     def start(self):
         result = self.formatTimeStamp(self.track.start, 'time')
@@ -429,6 +437,17 @@ class CreateWorkItemForm(ObjectForm, BaseTrackView):
             return time.strftime('%Y-%m-%d', time.localtime(ts))
         return ''
 
+    @Lazy
+    def deadlineTime(self):
+        ts = self.track.deadline# or getTimeStamp()
+        if ts:
+            return time.strftime('T%H:%M', time.localtime(ts))
+        return ''
+
+    @Lazy
+    def deadlineWithTime(self):
+        return self.globalOptions('organize.work.deadline_with_time')
+
     @Lazy
     def defaultTimeStamp(self):
         if self.workItemType.prefillDate:
@@ -583,7 +602,14 @@ class CreateWorkItem(EditObject, BaseTrackView):
             setValue('party')
         if action == 'move':
             setValue('task')
-        result['deadline'] = parseDate(form.get('deadline'))
+        #result['deadline'] = parseDate(form.get('deadline'))
+        deadline = form.get('deadline')
+        if deadline:
+            deadlineTime = (form.get('deadline_time', '').
+                                strip().replace('T', '') or '00:00:00')
+            result['deadline'] = parseDateTime('T'.join((deadline, deadlineTime)))
+        else:
+            result['deadline'] = None
         startDate = form.get('start_date', '').strip()
         endDate = form.get('end_date', '').strip() or startDate
         startTime = form.get('start_time', '').strip().replace('T', '') or '00:00:00'
diff --git a/organize/work/work_macros.pt b/organize/work/work_macros.pt
index 6ce4695..80aa11e 100644
--- a/organize/work/work_macros.pt
+++ b/organize/work/work_macros.pt
@@ -157,7 +157,12 @@
           <div id="deadline-input">
             <input type="text" name="deadline" style="width: 8em"
                    dojoType="dijit.form.DateTextBox"
-                   tal:attributes="value view/deadline" /></div>
+                   tal:attributes="value view/deadline" />
+            <input type="text" name="deadline_time" style="width: 6em"
+                   dojoType="dijit.form.TimeTextBox"
+                   tal:condition="view/deadlineWithTime"
+                   tal:attributes="value view/deadlineTime" />
+          </div>
         </div>
         <div id="start-end"
              tal:condition="python:'start-end' in workItemType.fields">
@@ -243,7 +248,11 @@
     </tr>
     <tr>
       <td><span i18n:translate="">Deadline</span>:</td>
-      <td tal:content="item/deadline"></td>
+      <td>
+        <span tal:content="item/deadline" />
+        <span tal:condition="item/deadlineWithTime"
+              tal:content="item/deadlineTime" />
+      </td>
     </tr>
     <tr>
       <td><span i18n:translate="">Start - End</span>:</td>