diff --git a/CHANGELOG b/CHANGELOG
index 23ee986..dde7be2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 - Add a gitlab.yml conversion support script
 - Correct default gravatar configuration (#112) (Julien Pivotto)
 - Update Ruby to 2.0.0p451
+- Fix name clash between release.sh and `make release`
 
 6.8.1
 - Use gitlab-rails 6.8.1
diff --git a/Makefile b/Makefile
index 8070c58..f381553 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ PLATFORM_DIR:=$(shell ruby -rjson -e 'puts JSON.parse(`bin/ohai`).values_at("pla
 build:
 	OMNIBUS_APPEND_TIMESTAMP=0 bin/omnibus build project ${PROJECT}
 
-release: no_changes on_tag purge build move_to_platform_dir sync
+do_release: no_changes on_tag purge build move_to_platform_dir sync
 
 no_changes:
 	git diff --quiet HEAD
diff --git a/release.sh b/release.sh
index b9da2df..028adca 100755
--- a/release.sh
+++ b/release.sh
@@ -4,7 +4,7 @@
 build="$(date '+%s')-$$"
 
 # Do the build and capture its output in a .log file
-make release 2>&1 | tee -a ${build}.log
+make do_release 2>&1 | tee -a ${build}.log
 
 # Check the exit status of `make`, not `tee`
 if [[ ${PIPESTATUS[0]} -eq 0 ]]; then
--
libgit2 0.21.2