diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index 717f8abdf2..8a211937a4 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -810,7 +810,10 @@
 
 	* Cache convertion from Evas_Map to RGBA_Map.
 
-
 2012-06-15  Vincent Torri
 
 	* Add Textgrid object.
+
+2012-06-15  Mike Blumenkrantz
+
+        * evas_object_smart_members_get() now returns NULL on non-smart objects
diff --git a/legacy/evas/NEWS b/legacy/evas/NEWS
index 2e300f512d..e6474fbf71 100644
--- a/legacy/evas/NEWS
+++ b/legacy/evas/NEWS
@@ -13,6 +13,7 @@ Improvements:
    * Don't wake up prepare thread if there is nothing to prepare.
    * Limit the updated region to fit in CPU cache for Pipe rendering.
    * Cache convertion from Evas_Map to RGBA_Map.
+   * evas_object_smart_members_get() now returns NULL on non-smart objects
 
 Fixes:
    * Add missing files in the tarball.
diff --git a/legacy/evas/src/lib/Evas.h b/legacy/evas/src/lib/Evas.h
index f5d25aacac..2f35415f95 100644
--- a/legacy/evas/src/lib/Evas.h
+++ b/legacy/evas/src/lib/Evas.h
@@ -10111,6 +10111,8 @@ EAPI void         evas_object_smart_member_del(Evas_Object *obj) EINA_ARG_NONNUL
  * The returned list should be freed with @c eina_list_free() when you
  * no longer need it.
  *
+ * @since 1.3 This function will return @c NULL when a non-smart object is passed.
+ *
  * @see evas_object_smart_member_add()
  * @see evas_object_smart_member_del()
  */