diff --git a/makefiles/patches/include.mk b/makefiles/patches/include.mk
index 541f756..47e6612 100644
--- a/makefiles/patches/include.mk
+++ b/makefiles/patches/include.mk
@@ -15,7 +15,7 @@
 # limitations under the License.
 # -----------------------------------------------------------------------
 
-include $(MAKEDIR)/patches/help.mk
+include $(ONF_MAKEDIR)/patches/help.mk
 
 patch-gather-args += --exclude=Makefile
 patch-gather-args += --exclude-dir=vault
@@ -27,14 +27,39 @@
 patch-gather-args += '-e' 'from collections import Mapping'
 patch-gather-args += '-e' 'from collections import MutableMapping'
 
+# Defined by [Mm]akefile or makefiles/virtualenv.mk
+venv-name   ?= $(error $(MAKE) venv-name= is required)
+
+PATCH_PATH  ?= $(error $(MAKE) PATCH_PATH= is required)
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
 patch-gather:
 	grep -r $(patch-gather-args)
 
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
 patch-diff:
-	$(HIDE)diff -qr staging vst_venv \
+	$(HIDE)diff -qr staging $(venv-name) \
 	    | awk '{print "# diff -Naur "$$2" "$$4}' \
 	    | tee $@.log
 
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+patch-create:
+	mkdir -p patches/$(PATCH_PATH)
+	diff -Naur staging/$(PATCH_PATH) $(venv-name)/$(PATCH_PATH) | tee patches/$(PATCH_PATH)/patch
+	exit 1
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+patch-init:
+	find "$(venv-name)" -name '__pycache__' -type d -print0 \
+	    | xargs -I'{}' --null --no-run-if-empty $(RM) -r {}
+	mkdir -p staging
+	rsync -rv --checksum "$(venv-name)/." "staging/."
+	@echo "Modify files beneath staging/ to create a patch source"
+
 # [SEE ALSO]
 # ---------------------------------------------------------------------------
 # https://bobbyhadz.com/blog/python-importerror-cannot-import-name-mapping-from-collections