diff --git a/data/database.py b/data/database.py
index fc5a68454..e6bda976a 100644
--- a/data/database.py
+++ b/data/database.py
@@ -104,6 +104,11 @@ class Repository(BaseModel):
     )
 
 
+class Webhook(BaseModel):
+  repository = ForeignKeyField(Repository)
+  parameters = TextField()
+
+
 class Role(BaseModel):
   name = CharField(index=True)
 
@@ -198,6 +203,7 @@ class QueueItem(BaseModel):
   available_after = DateTimeField(default=datetime.now, index=True)
   available = BooleanField(default=True, index=True)
   processing_expires = DateTimeField(null=True, index=True)
+  retries_remaining = IntegerField(default=5)
 
 
 all_models = [User, Repository, Image, AccessToken, Role,
diff --git a/data/queue.py b/data/queue.py
index 8e63c4d17..5f292a1d7 100644
--- a/data/queue.py
+++ b/data/queue.py
@@ -7,7 +7,7 @@ class WorkQueue(object):
   def __init__(self, queue_name):
     self.queue_name = queue_name
 
-  def put(self, message, available_after=0):
+  def put(self, message, available_after=0, retries_remaining=5):
     """
     Put an item, if it shouldn't be processed for some number of seconds,
     specify that amount as available_after.
@@ -16,6 +16,7 @@ class WorkQueue(object):
     params = {
       'queue_name': self.queue_name,
       'body': message,
+      'retries_remaining': retries_remaining,
     }
 
     if available_after:
@@ -37,7 +38,8 @@ class WorkQueue(object):
     # have one worker.
     avail = QueueItem.select().where(QueueItem.queue_name == self.queue_name,
                                      QueueItem.available_after <= now,
-                                     available_or_expired)
+                                     available_or_expired,
+                                     QueueItem.retries_remaining > 0)
 
     found = list(avail.limit(1).order_by(QueueItem.available_after))
 
@@ -45,6 +47,7 @@ class WorkQueue(object):
       item = found[0]
       item.available = False
       item.processing_expires = now + timedelta(seconds=processing_time)
+      item.retries_remaining -= 1
       item.save()
 
       return item
@@ -61,3 +64,4 @@ class WorkQueue(object):
 
 image_diff_queue = WorkQueue('imagediff')
 dockerfile_build_queue = WorkQueue('dockerfilebuild')
+webhook_queue = WorkQueue('webhook')
diff --git a/test/data/test.db b/test/data/test.db
index 20ed3819d..fc3f5c088 100644
Binary files a/test/data/test.db and b/test/data/test.db differ