diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 1ec722ffe..6210fd1e8 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -121,7 +121,9 @@ mfc: ensure-stable
 	fi
 .else
 	@git checkout stable/${PLUGIN_ABI}
-	@git cherry-pick -x ${MFC}
+	@if ! git cherry-pick -x ${MFC}; then \
+		git cherry-pick --abort; \
+	fi
 .endif
 	@git checkout master
 .endfor
@@ -131,3 +133,8 @@ stable:
 
 master:
 	@git checkout master
+
+rebase:
+	@git checkout stable/${PLUGIN_ABI}
+	@git rebase -i
+	@git checkout master