diff --git a/internal/gitw/project.go b/internal/gitw/project.go
index 02cb243..cb015ba 100644
--- a/internal/gitw/project.go
+++ b/internal/gitw/project.go
@@ -88,6 +88,9 @@ func (project *Project) merge() error {
 				milestone.Id,
 				taskwarrior.MILESTONE,
 			)
+			task.Due = taskwarrior.GoTimeToTaskTime(milestone.Due_on)
+			task.Entry = taskwarrior.GoTimeToTaskTime(milestone.Created_at)
+			task.Modified = taskwarrior.GoTimeToTaskTime(milestone.Updated_at)
 			task.AppendComment(milestone.Description, milestone.Updated_at)
 			fmt.Printf("\tCreated milestone: '%s'\n", task.Description)
 			tasks = append(tasks, task)
@@ -124,6 +127,8 @@ func (project *Project) merge() error {
 				taskwarrior.ISSUE,
 				issue.git_issue.Labels...,
 			)
+			task.Entry = taskwarrior.GoTimeToTaskTime(issue.git_issue.Created_at)
+			task.Modified = taskwarrior.GoTimeToTaskTime(issue.git_issue.Updated_at)
 			for _, comment := range issue.comments {
 				task.AppendComment(comment.Body, comment.Updated_at)
 			}