diff --git a/Makefile b/Makefile
index 1af274565..b0b8b2848 100644
--- a/Makefile
+++ b/Makefile
@@ -449,7 +449,9 @@ mfc: ensure-stable clean-mfcdir
 	fi
 .else
 	@git checkout stable/${CORE_ABI}
-	@git cherry-pick -x ${MFC}
+	@if ! git cherry-pick -x ${MFC}; then \
+		git cherry-pick --abort; \
+	fi
 .endif
 	@git checkout master
 .endfor