2 files changed, 8 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 5ea4190f..5d04c977 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .go
 /aerc2
 /aerc
+/aerc.debug
 log
 raw.log
 aerc.conf
diff --git a/Makefile b/Makefile
index e0946214..a1973d26 100644
--- a/Makefile
+++ b/Makefile
@@ -50,9 +50,13 @@ checkfmt:
 aerc.conf: config/aerc.conf.in
 	sed -e 's:@SHAREDIR@:$(SHAREDIR):g' > $@ < config/aerc.conf.in
 
-debug: $(GOSRC)
-	dlv debug --build-flags="$(GOFLAGS)" --headless \
-		--listen localhost:4747 >/dev/null 2>&1
+.PHONY: debug
+debug: aerc.debug
+	@echo 'Run `./aerc.debug` and use this command in another terminal to attach a debugger:'
+	@echo '    dlv attach $$(pidof aerc.debug)'
+
+aerc.debug: $(GOSRC)
+	$(GO) build $(GOFLAGS) -gcflags=*=-N -gcflags=*=-l -ldflags="$(LDFLAGS)" -o aerc.debug
 
 .1.scd.1:
 	scdoc < $< > $@