diff --git a/.make/go.mk b/.make/go.mk
index 5aa7d0b94e..a17a2d13e7 100644
--- a/.make/go.mk
+++ b/.make/go.mk
@@ -94,8 +94,14 @@ go-coverage:
 install: $(SOURCES)
 	go install -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/$(NAME)
 
+.PHONY: build-all
+build-all: build build-debug
+
 .PHONY: build
-build: $(BIN)/$(EXECUTABLE) $(BIN)/$(EXECUTABLE)-debug
+build: $(BIN)/$(EXECUTABLE)
+
+.PHONY: build-debug
+build-debug: $(BIN)/$(EXECUTABLE)-debug
 
 $(BIN)/$(EXECUTABLE): $(SOURCES)
 	$(GOBUILD) -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $@ ./cmd/$(NAME)
diff --git a/changelog/unreleased/build-all-targets.md b/changelog/unreleased/build-all-targets.md
new file mode 100644
index 0000000000..ca9f42021d
--- /dev/null
+++ b/changelog/unreleased/build-all-targets.md
@@ -0,0 +1,8 @@
+Enhancement: Add new build targets
+
+Make build target `build` used to build a binary twice, the second occurrence having symbols for debugging. We split this step in two and added `build-all` and `build-debug` targets.
+
+- `build-all` now behaves as the previous `build` target, it will generate 2 binaries, one for debug.
+- `build-debug` will build a single binary for debugging.
+
+https://github.com/owncloud/ocis/pull/1824