diff --git a/doc/changelog b/doc/changelog
index 7403b466..aad067b7 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,5 +1,8 @@
 2.0.4:
 	* Bugfix core: Remove traceback when sending SIGINT (aka Ctrl-C)
+	* Cleanup: __object_fq variable removed (never used)
+	* Cleanup: Environment variable __self DEPRECATED, use __object_name instead
+	* Cleanup: Environment variable __self scheduled for removal in cdist 2.1
 
 2.0.3: 2011-10-18
 	* Improved logging, added --verbose, by more quiet by default
diff --git a/doc/man/cdist-reference.text.sh b/doc/man/cdist-reference.text.sh
index 257ca36e..9127096c 100755
--- a/doc/man/cdist-reference.text.sh
+++ b/doc/man/cdist-reference.text.sh
@@ -181,7 +181,8 @@ __object_id::
    The type unique object id.
    Available for: type manifest, type explorer, type gencode
 __self::
-__object_fq::
+   DEPRECATED: Same as __object_name, do not use anymore, use __object_name instead.
+__object_name::
    The full qualified name of the current object.
    Available for: type manifest, type explorer, type gencode
 __target_host::