diff --git a/CHANGELOG b/CHANGELOG
index 8ec878bbfa..8ab1ba898d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -44,8 +44,9 @@ swift (1.11.0)
       The DiskFile abstraction for talking to data on disk has been
       refactored to allow alternate implementations to be developed.
       Included in the codebase is an in-memory reference
-      implementation. For full documentation, please see
-      http://docs.openstack.org/developer/swift/development_ondisk_backends.html
+      implementation. For full documentation, please see the developer
+      documentation. The DiskFile API is still a work in progress and
+      is not yet finalized.
 
     * Removal of swift-bench
 
diff --git a/doc/source/development_ondisk_backends.rst b/doc/source/development_ondisk_backends.rst
index 6762de5346..9479cc8eb7 100644
--- a/doc/source/development_ondisk_backends.rst
+++ b/doc/source/development_ondisk_backends.rst
@@ -15,6 +15,8 @@ servers. For historical reasons, the object server backend reference
 implementation module is named `diskfile`, while the account and container
 server backend reference implementation modules are named appropriately.
 
+This API is still under development and not yet finalized.
+
 -----------------------------------------
 Back-end API for Account Server REST APIs
 -----------------------------------------