diff --git a/bin/faafo b/bin/faafo
index 186ce89..a12770d 100644
--- a/bin/faafo
+++ b/bin/faafo
@@ -111,6 +111,7 @@ def do_show_fractal():
         output.add_row(["yb", data['yb']])
         output.add_row(["size", "%d bytes" % data['size']])
         output.add_row(["checksum", data['checksum']])
+        output.add_row(["generated_by", data['generated_by']])
         print(output)
     else:
         LOG.error("fractal '%s' not found" % CONF.command.uuid)
diff --git a/faafo/api/service.py b/faafo/api/service.py
index 4a241c0..9fe2b11 100644
--- a/faafo/api/service.py
+++ b/faafo/api/service.py
@@ -82,6 +82,7 @@ class Fractal(db.Model):
     ya = db.Column(db.Float, nullable=False)
     yb = db.Column(db.Float, nullable=False)
     image = db.Column(db.LargeBinary, nullable=True)
+    generated_by = db.Column(db.String(256), nullable=True)
 
     def __repr__(self):
         return '<Fractal %s>' % self.uuid
diff --git a/faafo/api/templates/index.html b/faafo/api/templates/index.html
index 0b73f3e..2b39664 100644
--- a/faafo/api/templates/index.html
+++ b/faafo/api/templates/index.html
@@ -47,6 +47,10 @@ yb = {{ fractal.yb }}</pre>
           <td>Checksum</td>
           <td><pre>{{ fractal.checksum }}</pre></td>
         </tr>
+        <tr>
+          <td>Generated by</td>
+          <td><pre>{{ fractal.generated_by }}</pre></td>
+        </tr>
       </tbody>
     </table>
   </div>
diff --git a/faafo/worker/service.py b/faafo/worker/service.py
index e3c7afb..d1bb193 100644
--- a/faafo/worker/service.py
+++ b/faafo/worker/service.py
@@ -21,6 +21,7 @@ import json
 import os
 from PIL import Image
 import random
+import socket
 import tempfile
 import time
 
@@ -139,7 +140,8 @@ class Worker(ConsumerMixin):
             'duration': elapsed_time,
             'image': image,
             'checksum': checksum,
-            'size': size
+            'size': size,
+            'generated_by': socket.gethostname()
         }
 
         # NOTE(berendt): only necessary when using requests < 2.4.2