diff --git a/capsule/Makefile b/capsule/Makefile
index a0aec7d..eee7273 100644
--- a/capsule/Makefile
+++ b/capsule/Makefile
@@ -5,20 +5,30 @@ LONGLOG_HEADER := $(TEMPLATES_DIR)/longlog-header.gmi
 LOGLOG_HEADER := $(TEMPLATES_DIR)/loglog-header.gmi
 MICROLOG_ENTRIES := $(wildcard microlog/*)
 LONGLOG_ENTRIES := $(wildcard content/logs/longlog/*)
+LOGLOG_TARGET := content/logs/loglog.gmi
+FEED_TARGET := $(COMITIUM_DATA)/subscriptions.json $(COMITIUM_DATA)/feed.gmi $(COMITIUM_DATA)/subscriptions.gmi
+FEED_OUTPUTS := $(FEED_TARGET) $(COMITIUM_DATA)/subscriptions.json $(COMITIUM_DATA)/feed.gmi $(COMITIUM_DATA)/subscriptions.gmi
+MICROLOG_TARGET := content/logs/microlog.gmi
+MICROLOG_OUTPUTS := $(MICROLOG_TARGET) $(wildcard content/logs/microlog/*)
+LONGLOG_TARGET := content/logs/longlog.gmi
 
-all: microlog loglog longlog add_feeds
+.DELETE_ON_ERROR:
+all: $(MICROLOG_TARGET) $(MICROLOG_OUTPUTS) $(LONGLOG_TARGET) $(LOGLOG_TARGET) $(FEED_OUTPUTS)
 
-microlog: $(MICROLOG_ENTRIES) $(MICROLOG_HEADER)
+$(MICROLOG_TARGET): $(wildcard microlog/*) $(MICROLOG_HEADER)
 	bash ./build_microlog.bash
 
-longlog: $(LONGLOG_ENTRIES) $(LONGLOG_HEADER)
+$(LONGLOG_TARGET): $(LONGLOG_ENTRIES) $(LONGLOG_HEADER)
 	bash ./build_longlog.bash
 
-loglog: microlog longlog $(LOGLOG_HEADER)
+$(LOGLOG_TARGET): $(MICROLOG_TARGET) $(LONGLOG_TARGET) $(LOGLOG_HEADER)
 	bash ./build_loglog.bash
 
-add_feeds: $(COMITIUM_DATA)/feeds.txt
+$(FEED_TARGET): $(COMITIUM_DATA)/feeds.txt
 	rm -f $(COMITIUM_DATA)/comitium.json
 	while read feed; do \
 		comitium add --data "$(COMITIUM_DATA)" $$feed; \
 	done <$(COMITIUM_DATA)/feeds.txt
+
+clean:
+	rm -rf $(MICROLOG_OUTPUTS) $(LONGLOG_TARGET) $(LOGLOG_TARGET) $(FEED_OUTPUTS)