diff --git a/.dockerignore b/.dockerignore
index 665da455015455f77644d9102fa7c387b72ddf73..de057764138cfcad9d112b1c15af3e25be787194 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,4 @@
 .env
 .env.*
+public/system
+public/assets
diff --git a/app/models/status.rb b/app/models/status.rb
index 52e6f8a21245dd2d0fc51222e2f65098115f2ebc..81744c25ebc53215b6334c6093daf041f7e6dc80 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -7,7 +7,7 @@ class Status < ActiveRecord::Base
   has_one :stream_entry, as: :activity, dependent: :destroy
 
   has_many :favourites, inverse_of: :status, dependent: :destroy
-  has_many :reblogs, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblog
+  has_many :reblogs, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblog, dependent: :destroy
   has_many :replies, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :thread
   has_many :mentioned_accounts, class_name: 'Mention', dependent: :destroy
 
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 7d8563a5801577d2ce978837731b9e3ea0b08b76..605f615fdff61a6cee7a3e3a9eef074b768d2c56 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -16,15 +16,21 @@ class ProcessFeedService < BaseService
 
       status = Status.find_by(uri: activity_id(entry))
 
+      # If we already have a post and the verb is now "delete", we gotta delete it and move on!
+      if verb(entry) == :delete
+        delete_post!(status)
+        next
+      end
+
       next unless status.nil?
 
       status = Status.new(uri: activity_id(entry), url: activity_link(entry), account: account, text: content(entry), created_at: published(entry), updated_at: updated(entry))
 
-      if object_type(entry) == :comment
+      if object_type(entry) == :comment && verb(entry) == :post
         add_reply!(entry, status)
       elsif verb(entry) == :share
         add_reblog!(entry, status)
-      else
+      elsif verb(entry) == :post
         add_post!(entry, status)
       end
 
@@ -71,6 +77,10 @@ class ProcessFeedService < BaseService
     status.save!
   end
 
+  def delete_post!(status)
+    status.destroy!
+  end
+
   def find_original_status(_xml, id)
     return nil if id.nil?