diff --git a/opaque.c b/opaque.c
index f098ffc15..7704ec7a7 100644
--- a/opaque.c
+++ b/opaque.c
@@ -50,6 +50,13 @@ int register_opaque_master(const struct opaque_master *mst, void *data)
 {
 	struct registered_master rmst = {0};
 
+	if (mst->shutdown) {
+		if (register_shutdown(mst->shutdown, data)) {
+			mst->shutdown(data); /* cleanup */
+			return 1;
+		}
+	}
+
 	if (!mst->probe || !mst->read || !mst->write || !mst->erase) {
 		msg_perr("%s called with incomplete master definition. "
 			 "Please report a bug at flashrom@flashrom.org\n",
diff --git a/programmer.h b/programmer.h
index ec5598727..3de87e58e 100644
--- a/programmer.h
+++ b/programmer.h
@@ -443,6 +443,7 @@ struct opaque_master {
 	int (*read) (struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len);
 	int (*write) (struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
 	int (*erase) (struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen);
+	int (*shutdown)(void *data);
 	void *data;
 };
 int register_opaque_master(const struct opaque_master *mst, void *data);