diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index dcdd534faed6b966e4594dd8d7adcc0718616901..6a095f691161db09346290dd72787d7cb21128de 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,7 @@
 
 CCK 6.2.dev
 ============
+- #271294 Add TODO to get rid of content_write_record() once drupal_write_record() is patched.
 - #271294 Add documentation for the reason for having a custom version of drupal_write_record.
 - Avoid E_All error when prefixes and suffixes are not defined in number module.
 - Avoid E_All error, don't try to return $item[0] if there are no items.
diff --git a/content.module b/content.module
index 8af551b18836bc8a6c10e8dac69871884d3fa028..f64d057ae75e4f29d6a18fc915a85e5f7270cb1d 100644
--- a/content.module
+++ b/content.module
@@ -946,6 +946,10 @@ function content_storage($op, $node) {
  * Directly copied from core's drupal_write_record, which can't update a
  * column to NULL. See http://drupal.org/node/227677 and 
  * http://drupal.org/node/226264 for more details about that problem.
+ * 
+ * TODO - get rid of this function and change references back to 
+ * drupal_write_record() if the patch gets into core. Will need a method
+ * of protecting people on older versions, though.
  *
  * Default values are filled in for missing items, and 'serial' (auto increment)
  * types are filled in with IDs.