diff --git a/lib/commands/moveToDelayed-3.lua b/lib/commands/moveToDelayed-3.lua
index 143a31197..8bb017694 100644
--- a/lib/commands/moveToDelayed-3.lua
+++ b/lib/commands/moveToDelayed-3.lua
@@ -9,6 +9,10 @@
     ARGV[1] delayedTimestamp
     ARGV[2] the id of the job
     ARGV[3] queue token
+    ARGV[4] should update job error data (with args 5-7)
+    ARGV[5]  |- attemptsMade
+    ARGV[6]  |- stacktrace
+    ARGV[7]  |- failedReason
 
   Output:
     0 - OK
@@ -21,6 +25,10 @@
 local rcall = redis.call
 
 if rcall("EXISTS", KEYS[3]) == 1 then
+  -- Update job data if desired.
+  if ARGV[4] == "1" then
+    rcall("HMSET", KEYS[3], "attemptsMade", ARGV[5], "stacktrace", ARGV[6], "failedReason", ARGV[7])
+  end
 
   -- Check for job lock
   if ARGV[3] ~= "0" then
diff --git a/lib/commands/moveToFinished-7.lua b/lib/commands/moveToFinished-7.lua
index bd28c6fdb..a0126caf1 100644
--- a/lib/commands/moveToFinished-7.lua
+++ b/lib/commands/moveToFinished-7.lua
@@ -26,6 +26,10 @@
       ARGV[9]  base key
       ARGV[10] lock duration
       ARGV[11] token
+      ARGV[12] should update job error data (with args 13-15)
+      ARGV[13]  |- attemptsMade
+      ARGV[14]  |- stacktrace
+      ARGV[15]  |- failedReason
 
      Output:
       0 OK
@@ -38,6 +42,11 @@
 local rcall = redis.call
 
 if rcall("EXISTS", KEYS[3]) == 1 then -- // Make sure job exists
+  -- Update job data if desired.
+  if ARGV[12] == "1" then
+    rcall("HMSET", KEYS[3], "attemptsMade", ARGV[13], "stacktrace", ARGV[14], "failedReason", ARGV[15])
+  end
+
   if ARGV[5] ~= "0" then
     local lockKey = KEYS[3] .. ':lock'
     if rcall("GET", lockKey) == ARGV[5] then
diff --git a/lib/commands/retryJob-3.lua b/lib/commands/retryJob-3.lua
index 0a1d13528..60f703a4e 100644
--- a/lib/commands/retryJob-3.lua
+++ b/lib/commands/retryJob-3.lua
@@ -9,6 +9,10 @@
       ARGV[1]  pushCmd
       ARGV[2]  jobId
       ARGV[3]  token
+      ARGV[4]  should update job error data (with args 5-7)
+      ARGV[5]   |- attemptsMade
+      ARGV[6]   |- stacktrace
+      ARGV[7]   |- failedReason
 
     Events:
       'prefix:added'
@@ -19,6 +23,10 @@
      -2 - Job Not locked
 ]]
 if redis.call("EXISTS", KEYS[3]) == 1 then
+  -- Update job data if desired.
+  if ARGV[4] == "1" then
+    redis.call("HMSET", KEYS[3], "attemptsMade", ARGV[5], "stacktrace", ARGV[6], "failedReason", ARGV[7])
+  end
 
   -- Check for job lock
   if ARGV[3] ~= "0" then
diff --git a/lib/scripts.js b/lib/scripts.js
index 9ddfc59db..8229bf85b 100644
--- a/lib/scripts.js
+++ b/lib/scripts.js
@@ -110,7 +110,8 @@ const scripts = {
     shouldRemove,
     target,
     ignoreLock,
-    notFetch
+    notFetch,
+    errorInfo
   ) {
     const queue = job.queue;
     const queueKeys = queue.keys;
@@ -131,6 +132,8 @@ const scripts = {
       shouldRemove = `${shouldRemove + 1}`;
     }
 
+    errorInfo = errorInfo instanceof Object ? errorInfo : {};
+
     const args = [
       job.id,
       job.finishedOn,
@@ -142,7 +145,11 @@ const scripts = {
       notFetch || queue.paused || queue.closing || queue.limiter ? 0 : 1,
       queueKeys[''],
       queue.settings.lockDuration,
-      queue.token
+      queue.token,
+      errorInfo.attemptsMade ? '1' : '0',
+      errorInfo.attemptsMade,
+      errorInfo.stacktrace,
+      errorInfo.message
     ];
 
     return keys.concat(args);
@@ -205,7 +212,7 @@ const scripts = {
     );
   },
 
-  moveToFailedArgs(job, failedReason, removeOnFailed, ignoreLock) {
+  moveToFailedArgs(job, failedReason, removeOnFailed, ignoreLock, errorInfo) {
     return scripts.moveToFinishedArgs(
       job,
       failedReason,
@@ -213,7 +220,8 @@ const scripts = {
       removeOnFailed,
       'failed',
       ignoreLock,
-      true
+      true,
+      errorInfo
     );
   },
 
@@ -235,7 +243,7 @@ const scripts = {
     return job.queue.client.isFinished(keys.concat([job.id]));
   },
 
-  moveToDelayedArgs(queue, jobId, timestamp, ignoreLock) {
+  moveToDelayedArgs(queue, jobId, timestamp, ignoreLock, errorInfo) {
     //
     // Bake in the job id first 12 bits into the timestamp
     // to guarantee correct execution order of delayed jobs
@@ -251,13 +259,19 @@ const scripts = {
       timestamp = timestamp * 0x1000 + (jobId & 0xfff);
     }
 
+    errorInfo = errorInfo instanceof Object ? errorInfo : {};
+
     const keys = _.map(['active', 'delayed', jobId], name => {
       return queue.toKey(name);
     });
     return keys.concat([
       JSON.stringify(timestamp),
       jobId,
-      ignoreLock ? '0' : queue.token
+      ignoreLock ? '0' : queue.token,
+      errorInfo.attemptsMade ? '1' : '0',
+      errorInfo.attemptsMade,
+      errorInfo.stacktrace,
+      errorInfo.message
     ]);
   },
 
@@ -411,7 +425,7 @@ const scripts = {
     ]);
   },
 
-  retryJobArgs(job, ignoreLock) {
+  retryJobArgs(job, ignoreLock, errorInfo) {
     const queue = job.queue;
     const jobId = job.id;
 
@@ -421,7 +435,17 @@ const scripts = {
 
     const pushCmd = (job.opts.lifo ? 'R' : 'L') + 'PUSH';
 
-    return keys.concat([pushCmd, jobId, ignoreLock ? '0' : job.queue.token]);
+    errorInfo = errorInfo instanceof Object ? errorInfo : {};
+
+    return keys.concat([
+      pushCmd,
+      jobId,
+      ignoreLock ? '0' : job.queue.token,
+      errorInfo.attemptsMade ? '1' : '0',
+      errorInfo.attemptsMade,
+      errorInfo.stacktrace,
+      errorInfo.message
+    ]);
   },
 
   /**