diff --git a/configure b/configure
index f5557ce2c..9c60289ed 100755
--- a/configure
+++ b/configure
@@ -1115,7 +1115,6 @@ if echo -e '#include <uuid/uuid.h>\nint main(void) { uuid_generate_sha1(NULL, NU
 fi
 
 if [[ "${CONFIG[OCF]}" = "y" ]]; then
-	echo "WARNING: OCF - bdev_ocf is deprecated."
 	# If OCF_PATH is a file, assume it is a library and use it to compile with
 	if [ -f ${CONFIG[OCF_PATH]} ]; then
 		CONFIG[CUSTOMOCF]=y
diff --git a/deprecation.md b/deprecation.md
index 54fcf0e8d..efeaca5d6 100644
--- a/deprecation.md
+++ b/deprecation.md
@@ -44,8 +44,11 @@ VTune integration is in now deprecated and will be removed in SPDK 23.05.
 
 #### `bdev_ocf`
 
-The Open CAS Framework (OCF) integration via bdev module and env_ocf is now deprecated
-and will be removed in SPDK 23.05.
+The Open CAS Framework (OCF) integration via bdev module and env_ocf is currently marked
+deprecated due to discontinued support from Intel. However, Huawei is working to pick up
+support for these components, and the OCF project in general. This code will definitely
+remain in SPDK 23.05 release, in fact it is likely deprecation notice will be removed by
+then.
 
 ### nvme
 
diff --git a/module/bdev/ocf/vbdev_ocf.c b/module/bdev/ocf/vbdev_ocf.c
index 0c12856f0..003e36860 100644
--- a/module/bdev/ocf/vbdev_ocf.c
+++ b/module/bdev/ocf/vbdev_ocf.c
@@ -1256,7 +1256,10 @@ error_free:
 	return rc;
 }
 
-SPDK_LOG_DEPRECATION_REGISTER(bdev_ocf, "bdev_ocf support", "SPDK 23.05", 0);
+/* This deprecation is likely to be removed, and the ocf support will remain
+ * in SPDK.  See deprecation.md for more details.
+ */
+SPDK_LOG_DEPRECATION_REGISTER(bdev_ocf, "bdev_ocf support", "SPDK 23.09", 0);
 
 /* Read configuration file at the start of SPDK application
  * This adds vbdevs to global list if some mentioned in config */
@@ -1265,8 +1268,6 @@ vbdev_ocf_init(void)
 {
 	int status;
 
-	SPDK_LOG_DEPRECATED(bdev_ocf);
-
 	status = vbdev_ocf_ctx_init();
 	if (status) {
 		SPDK_ERRLOG("OCF ctx initialization failed with=%d\n", status);