diff --git a/src/agent/commands/task.addattachment.ts b/src/agent/commands/task.addattachment.ts
new file mode 100644
index 0000000..12aec40
--- /dev/null
+++ b/src/agent/commands/task.addattachment.ts
@@ -0,0 +1,78 @@
+/// <reference path="../definitions/vso-node-api.d.ts" />
+
+import ctxm = require('../context');
+import cm = require('../common');
+import Q = require('q');
+import cmdm = require('./command');
+import webapim = require('vso-node-api/WebApi');
+import buildifm = require('vso-node-api/interfaces/BuildInterfaces');
+import path = require('path');
+import fs = require('fs');
+
+export function createAsyncCommand(executionContext: cm.IExecutionContext, command: cm.ITaskCommand) {
+    return new AddAttachmentCommand(executionContext, command);
+}
+
+export class AddAttachmentCommand implements cm.IAsyncCommand {
+    constructor(executionContext: cm.IExecutionContext, command: cm.ITaskCommand) {
+        this.command = command;
+        this.executionContext = executionContext;
+        this.description = "Upload and attach attachment to current timeline record.";
+    }
+
+    public command: cm.ITaskCommand;
+    public description: string;
+    public executionContext: cm.IExecutionContext;
+
+    public runCommandAsync(): Q.Promise<any> {
+        var filename = this.command.message;
+        if (!filename) {
+            return Q(null);
+        }
+
+        var type = this.command.properties['type'];
+        if (!type) {
+            return Q(null);
+        }
+
+        var name = this.command.properties['name'];
+        if (!name) {
+            return Q(null);
+        }
+
+        var deferred = Q.defer();
+        fs.exists(filename, (exists: boolean) => {
+            if (!exists) {
+                deferred.resolve(null);
+            }
+
+            var projectId: string = this.executionContext.variables[ctxm.WellKnownVariables.projectId];
+
+            var webapi = this.executionContext.getWebApi();
+            var taskClient = webapi.getQTaskApi();
+
+            fs.stat(filename, (err: NodeJS.ErrnoException, stats: fs.Stats) => {
+                if (err) {
+                    deferred.reject(err);
+                }
+                else {
+                    var headers = {};
+                    headers["Content-Length"] = stats.size;
+                    var stream = fs.createReadStream(filename);
+                    taskClient.createAttachment(
+                        headers,
+                        stream,
+                        projectId,
+                        this.executionContext.jobInfo.description,
+                        this.executionContext.jobInfo.planId,
+                        this.executionContext.jobInfo.timelineId,
+                        this.executionContext.recordId,
+                        type,
+                        name).then(() => deferred.resolve(null), (err: any) => deferred.reject(err));
+                }
+            })
+        });
+
+        return deferred.promise;
+    }
+}