diff --git a/HISTORY.rst b/HISTORY.rst
index 4866d66974..adb5b1bb37 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -30,6 +30,7 @@
 - Add makefile target to launch a production staging Docker image.
 - Improve duplicated document list view logic to not show 
   documents with trashed duplicates.
+- Backport Docker composer makefile targets.
 
 3.2.8 (2019-10-01)
 ==================
diff --git a/docker/Makefile b/docker/Makefile
index 10ac96a8ec..d3e49fed4b 100755
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -27,6 +27,15 @@ docker-runtest-cleanup: ## Delete the test container and the test volume.
 docker-runtest-all: ## Executed the test suite in a test container.
 	docker run --rm run-tests
 
+docker-compose-build:
+	docker-compose -f docker/docker-compose.yml -p mayan-edms build
+
+docker-compose-build-with-proxy:
+	docker-compose -f docker/docker-compose.yml -p mayan-edms build --build-arg APT_PROXY=$(APT_PROXY)
+
+docker-compose-up:
+	docker-compose -f docker/docker-compose.yml -p mayan-edms up
+
 docker-staging-network-create:
 	@docker network rm mayan-staging || true
 	docker network create mayan-staging